From d2f8483e06286f36269ce69340641be63ec16d07 Mon Sep 17 00:00:00 2001 From: David Badura Date: Sat, 17 Oct 2026 19:46:11 +0200 Subject: [PATCH] Use workflow_ref for the concurrency groups Follow-up to the concurrency groups added in the last pull request. They used the workflow name plus the branch name, which lets two workflows with the same name cancel each other on the same branch, and two fork pull requests with the same branch name (e.g. patch-1) cancel each other. github.workflow_ref is the workflow file plus the ref (refs/pull//merge for pull requests) and has neither problem. --- .github/workflows/backward-compatibility-check.yml | 2 +- .github/workflows/benchmark.yml | 2 +- .github/workflows/coding-standard.yml | 2 +- .github/workflows/docs-check.yml | 2 +- .github/workflows/integration.yml | 2 +- .github/workflows/mutation-tests-diff.yml | 2 +- .github/workflows/mutation-tests.yml | 2 +- .github/workflows/phpstan.yml | 2 +- .github/workflows/unit.yml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/backward-compatibility-check.yml b/.github/workflows/backward-compatibility-check.yml index e2ecd0d78..2de5492e4 100644 --- a/.github/workflows/backward-compatibility-check.yml +++ b/.github/workflows/backward-compatibility-check.yml @@ -6,7 +6,7 @@ on: pull_request: concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index ab820b408..bcf7c67b0 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -6,7 +6,7 @@ on: pull_request: concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/coding-standard.yml b/.github/workflows/coding-standard.yml index 78a6edcb7..f86b0ccbd 100644 --- a/.github/workflows/coding-standard.yml +++ b/.github/workflows/coding-standard.yml @@ -10,7 +10,7 @@ on: - "renovate/*" concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index db22a1f4a..6569913e4 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -9,7 +9,7 @@ on: - "[0-9]+.[0-9]+.x" concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index a67f46626..094533620 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -10,7 +10,7 @@ on: - "renovate/*" concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/mutation-tests-diff.yml b/.github/workflows/mutation-tests-diff.yml index 4933ac43e..a4d4d2849 100644 --- a/.github/workflows/mutation-tests-diff.yml +++ b/.github/workflows/mutation-tests-diff.yml @@ -6,7 +6,7 @@ on: pull_request: concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/mutation-tests.yml b/.github/workflows/mutation-tests.yml index 0f44505f0..6cceb5b7d 100644 --- a/.github/workflows/mutation-tests.yml +++ b/.github/workflows/mutation-tests.yml @@ -10,7 +10,7 @@ on: - "renovate/*" concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index e71347b4d..8803d9627 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -10,7 +10,7 @@ on: - "renovate/*" concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 22a7699dd..505819935 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -10,7 +10,7 @@ on: - "renovate/*" concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} + group: ${{ github.workflow_ref }} cancel-in-progress: true jobs: