ci: pass needs_trapeze_artifacts to buil_release

aeharding · Nov 13, 2024 · b20032d · b20032d
1 parent acedaf8
commit b20032d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
@@ -2,6 +2,10 @@ name: build_release
 
 on:
   workflow_call: # for beta releases from main - release.yml / dispatch_beta_release
+    inputs:
+      needs_trapeze_artifacts:
+        type: boolean
+        required: true
   push:
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
@@ -61,7 +65,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download bumped version artifacts
-        if: github.event.workflow_call
+        if: inputs.needs_trapeze_artifacts
         uses: actions/download-artifact@v4
         with:
           name: trapeze-artifacts
@@ -116,7 +120,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download bumped version artifacts
-        if: github.event.workflow_call
+        if: inputs.needs_trapeze_artifacts
         uses: actions/download-artifact@v4
         with:
           name: trapeze-artifacts
@@ -168,7 +172,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download bumped version artifacts
-        if: github.event.workflow_call
+        if: inputs.needs_trapeze_artifacts
         uses: actions/download-artifact@v4
         with:
           name: trapeze-artifacts

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,6 +29,7 @@ jobs:
       app_build: ${{ steps.calculate.outputs.app_build }}
 
   validate_version:
+    if: github.ref_name != 'main'
     needs: app_build_number
     runs-on: ubuntu-latest
     outputs:
@@ -88,6 +89,8 @@ jobs:
     if: github.ref_name == 'main'
     needs: bump_src
     uses: ./.github/workflows/build_release.yml
+    with:
+      needs_trapeze_artifacts: true
     permissions:
       contents: write # needed for create_release, even though it won't be called