add TERRAFYING_VERSION build arg

uswitch · Jan 5, 2024 · b3781b1 · b3781b1
1 parent 9462332
commit b3781b1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml
@@ -37,6 +37,8 @@ jobs:
   docker:
     needs: build
     runs-on: ubuntu-latest
+    env:
+      RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
     steps:
       - uses: actions/checkout@v4
       - name: Login to Quay.io
@@ -54,11 +56,12 @@ jobs:
         with:
           images: quay.io/uswitch/terrafying-components
           tags: |
-            type=sha,prefix=,format=long,
+            type=sha,prefix=,format=long
             type=semver,pattern={{version}}
       - uses: docker/build-push-action@v4
         with:
           context: .
           labels: ${{ steps.meta.outputs.labels }}
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ steps.meta.outputs.tags }}
+          build-args: "TERRAFYING_VERSION=${{ contains(github.ref, 'refs/tags/') && github.ref_name }}"
diff --git a/.github/workflows/tag.yaml b/.github/workflows/tag.yaml
@@ -11,7 +11,6 @@ permissions:
 
 jobs:
   push:
-    if: github.ref_name == 'master' && contains(github.ref, 'refs/tags/v')
     env:
       RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
     runs-on: ubuntu-latest
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ permissions: @@
     jobs:
       push:
-        if: github.ref_name == 'master' && contains(github.ref, 'refs/tags/v')
         env:
           RUBYGEMS_API_KEY: ${{ secrets.RUBYGEMS_API_KEY }}
         runs-on: ubuntu-latest
@@ Expand Down @@