Fix autotag triggering tag build (#297)

Islandora-Devops · Oct 30, 2023 · c78628f · c78628f
1 parent 40cf50d
commit c78628f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -1,6 +1,11 @@
 name: Build and Push Docker Images
 on:
   push:
+  workflow_dispatch:
+    inputs:
+      tag:
+        type: string
+        required: true
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true
@@ -11,7 +16,8 @@ jobs:
   tags:
     uses: ./.github/workflows/tags.yml
     with:
-      tag: ${{ github.ref_name }}
+      # Use tag from workflow_dispatch OR push event
+      tag: ${{ inputs.tag && inputs.tag || github.ref_name }}
     secrets: inherit
   base:
     uses: ./.github/workflows/build.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,6 +7,7 @@ on:
       - closed
 permissions:
   contents: write
+  actions: write
 jobs:
   release:
     if: github.event.pull_request.merged == true
@@ -24,5 +25,6 @@ jobs:
           git tag $TAG
           git push origin $TAG
           gh release create $TAG
+          gh workflow run push.yml -f tag=$TAG --ref $TAG
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}