Pass correct ref to release action (#22512)

matomo-org · Aug 16, 2024 · 74446d1 · 74446d1
1 parent a954f3e
commit 74446d1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/matomo-tests.yml b/.github/workflows/matomo-tests.yml
@@ -19,6 +19,10 @@ on:
         type: boolean
         required: false
         default: false
+      ref:
+        type: string
+        required: false
+        default: ''
 
 permissions:
   actions: read
@@ -33,7 +37,7 @@ permissions:
   statuses: none
 
 concurrency:
-  group: php-${{ github.ref }}
+  group: php-${{ inputs.ref || github.ref }}
   cancel-in-progress: true
 
 jobs:
@@ -66,7 +70,7 @@ jobs:
           persist-credentials: false
           submodules: true
           path: matomo
-          ref: ${{ inputs.is_preview == true && '5.x-preview' || github.ref }}
+          ref: ${{ inputs.ref || github.ref }}
       - name: running tests
         uses: matomo-org/github-action-tests@main
         with:
@@ -88,7 +92,7 @@ jobs:
           persist-credentials: false
           submodules: true
           path: matomo
-          ref: ${{ inputs.is_preview == true && '5.x-preview' || github.ref }}
+          ref: ${{ inputs.ref || github.ref }}
       - name: running tests
         uses: matomo-org/github-action-tests@main
         with:
@@ -105,7 +109,7 @@ jobs:
           persist-credentials: false
           submodules: true
           path: matomo
-          ref: ${{ inputs.is_preview == true && '5.x-preview' || github.ref }}
+          ref: ${{ inputs.ref || github.ref }}
       - name: running tests
         uses: matomo-org/github-action-tests@main
         with:
@@ -125,7 +129,7 @@ jobs:
           persist-credentials: false
           submodules: true
           path: matomo
-          ref: ${{ inputs.is_preview == true && '5.x-preview' || github.ref }}
+          ref: ${{ inputs.ref || github.ref }}
       - name: running tests
         uses: matomo-org/github-action-tests@main
         with:

diff --git a/.github/workflows/release-preview.yml b/.github/workflows/release-preview.yml
@@ -156,6 +156,7 @@ jobs:
       needs.prepare_preview_version.outputs.has_new_version == '1'
     with:
       is_preview: true
+      ref: 5.x-preview
 
   release_preview_version:
     needs: [run_matomo_tests]
@@ -168,6 +169,7 @@ jobs:
       needs.prepare_preview_version.outputs.has_new_version == '1'
     with:
       is_preview: true
+      ref: 5.x-preview
     secrets:
       RELEASE_PASSWORD: ${{ secrets.RELEASE_PASSWORD }}
       GPG_CERTIFICATE: ${{ secrets.GPG_CERTIFICATE }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,6 +36,10 @@ on:
         type: boolean
         required: false
         default: false
+      ref:
+        type: string
+        required: false
+        default: ''
     secrets:
       RELEASE_PASSWORD:
         description: 'Release password'
@@ -68,6 +72,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           lfs: false
+          ref: ${{ inputs.ref || github.ref }}
       - name: Import GPG key
         id: import_gpg
         run: |