Merge pull request #132 from uswitch/AIRSHIP-3064-gha-migration-tag-2

AIRSHIP-3064 GHA migration - fix tag (again)
uswitch · Jan 9, 2024 · 447d31a · 447d31a
2 parents 57ba618 + 27ae4eb
commit 447d31a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -1,6 +1,9 @@
 name: push
 
-on: push
+on: 
+  push:
+    branches:
+      - '**'
 
 permissions:
   contents: read

diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
@@ -25,9 +25,12 @@ jobs:
       - uses: actions/upload-artifact@v3
         with:
           name: pkg
-          path: pkg/
+          path: |
+            pkg/
+            lib/
 
   push:
+    needs: build
     env:
       RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
       GHA_TERRAFYING_VERSION: ${{ github.ref_name }}
@@ -38,6 +41,10 @@ jobs:
         with:
           bundler-cache: true
           ruby-version: 3.2.2
+      - uses: actions/download-artifact@v3
+        with:
+          name: pkg
+          path: ./
       - run: rake push
 
   docker:
@@ -62,6 +69,7 @@ jobs:
         with:
           images: quay.io/uswitch/terrafying
           tags: type=semver,pattern={{version}}
+      - run: 'echo TERRAFYING_VERSION=${{ github.ref_name }}' 
       - uses: docker/build-push-action@v4
         with:
           context: .