From: George Joseph <gjoseph@sangoma.com>
Date: Thu, 20 Feb 2025 17:40:04 +0000 (-0700)
Subject: .github: Change concurrency group ids so they're unique.
X-Git-Tag: 21.8.0-rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4017eadafabd2bae51b0535998e0ea27f338c3c;p=thirdparty%2Fasterisk.git

.github: Change concurrency group ids so they're unique.

GitHub strikes again.  Apparently the github.ref context variable only
contains the PR number if the workflow is triggered by "pull_request" so
since we just changed the trigger to "pull_request_target" the variable
no longer contains the PR number and is therefore not unique and can't be
used as a concurrency group id.  We now use
`github.triggering_actor-github.head_ref`.

(cherry picked from commit 1a7c9e0a041bf14978a1a4659a4bd18be51c66a5)
---

diff --git a/.github/workflows/OnPRCPCheck.yml b/.github/workflows/OnPRCPCheck.yml
index 9f970d732d..96c04002dc 100644
--- a/.github/workflows/OnPRCPCheck.yml
+++ b/.github/workflows/OnPRCPCheck.yml
@@ -9,6 +9,6 @@ jobs:
     name: "run-cpcheck"
     if: ${{ github.event.label.name == vars.CHERRY_PICK_TEST_LABEL }}
     concurrency:
-      group: cpcheck-${{ github.base_ref }}-${{ github.ref_name }}
+      group: cpcheck-${{ github.triggering_actor }}-${{ github.head_ref }}
       cancel-in-progress: true
     uses: asterisk/asterisk-ci-actions/.github/workflows/AsteriskPRCPCheck.yml@main
diff --git a/.github/workflows/OnPRCheck.yml b/.github/workflows/OnPRCheck.yml
index 59dc56106f..53aec0173e 100644
--- a/.github/workflows/OnPRCheck.yml
+++ b/.github/workflows/OnPRCheck.yml
@@ -9,6 +9,6 @@ jobs:
     name: "run-check"
     if: ${{ (github.event.action != 'labeled') || (github.event.action == 'labeled' && github.event.label.name == vars.RECHECKPR_LABEL) }}
     concurrency:
-      group: check-${{ github.base_ref }}-${{ github.ref_name }}
+      group: check-${{ github.triggering_actor }}-${{ github.head_ref }}
       cancel-in-progress: true
     uses: asterisk/asterisk-ci-actions/.github/workflows/AsteriskPRCheck.yml@main
diff --git a/.github/workflows/OnPRMergeApproved.yml b/.github/workflows/OnPRMergeApproved.yml
index a4b0a3a7e0..8c24505574 100644
--- a/.github/workflows/OnPRMergeApproved.yml
+++ b/.github/workflows/OnPRMergeApproved.yml
@@ -9,6 +9,6 @@ jobs:
     name: "run-merge"
     if: contains(fromJSON(vars.MERGE_APPROVED_LABELS), github.event.label.name)
     concurrency:
-      group: merge-${{ github.base_ref }}-${{ github.ref_name }}
+      group: merge-${{ github.triggering_actor }}-${{ github.head_ref }}
       cancel-in-progress: true
     uses: asterisk/asterisk-ci-actions/.github/workflows/AsteriskPRMerge.yml@main