chore: tag, cont

dashpay · Aug 21, 2024 · 3d7ae2c · 3d7ae2c
1 parent 0334cd5
commit 3d7ae2c
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,10 +14,6 @@ on:
         description: Dry run - do not push
         default: false
 
-env:
-  # Provided tag can override the tag from the release event
-  IMAGE_TAG: ${{ github.event.inputs.tag || github.event.release.tag_name }}
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -104,7 +100,7 @@ jobs:
         with:
           result-encoding: string
           script: |
-            const tag = vars.IMAGE_TAG;
+            const tag = inputs.tag || github.event.release.tag_name;
             const [, major, minor] = tag.match(/^v([0-9]+)\.([0-9]+)/);
             return (tag.includes('-') ? `${major}.${minor}-${{steps.suffix.outputs.result}}` : 'latest');
 
@@ -145,7 +141,7 @@ jobs:
       image_org: dashpay
       image_name: drive
       target: drive-abci
-      tag: ${{ vars.IMAGE_TAG }}
+      tag: ${{ inputs.tag || github.event.release.tag_name }}
       dry_run: ${{ inputs.dry_run }}
 
   release-drive-image-debug:
@@ -158,7 +154,7 @@ jobs:
       image_name: drive
       target: drive-abci
       cargo_profile: dev
-      tag: ${{ vars.IMAGE_TAG }}
+      tag: ${{ inputs.tag || github.event.release.tag_name }}
       dry_run: ${{ inputs.dry_run }}
 
   release-dapi-image:
@@ -170,7 +166,7 @@ jobs:
       image_org: dashpay
       image_name: dapi
       target: dapi
-      tag: ${{ vars.IMAGE_TAG }}
+      tag: ${{ inputs.tag || github.event.release.tag_name }}
       dry_run: ${{ inputs.dry_run }}
 
   release-test-suite-image:
@@ -182,7 +178,7 @@ jobs:
       image_org: dashpay
       image_name: platform-test-suite
       target: test-suite
-      tag: ${{ vars.IMAGE_TAG }}
+      tag: ${{ inputs.tag || github.event.release.tag_name }}
       dry_run: ${{ inputs.dry_run }}
 
   release-dashmate-helper-image:
@@ -194,7 +190,7 @@ jobs:
       image_org: dashpay
       image_name: dashmate-helper
       target: dashmate-helper
-      tag: ${{ vars.IMAGE_TAG }}
+      tag: ${{ inputs.tag || github.event.release.tag_name }}
       dry_run: ${{ inputs.dry_run }}
 
   release-dashmate-packages: