Skip to content

Commit 4736bf8

Browse files
Rollup merge of rust-lang#113173 - Kobzol:ci-concurrency-group-workflow, r=pietroalbini
CI: include workflow name in concurrency group Currently, this won't change anything, because we only have one relevant workflow (`CI`), but for future proofing we should probably include the workflow name in the concurrency group. Found by `@klensy` [here](rust-lang#113059 (comment)).
2 parents eb3b666 + f880246 commit 4736bf8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ defaults:
3131
run:
3232
shell: bash
3333
concurrency:
34-
group: "${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
34+
group: "${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
3535
cancel-in-progress: true
3636
jobs:
3737
pr:

src/ci/github-actions/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ concurrency:
302302
# For a given workflow, if we push to the same branch, cancel all previous builds on that branch.
303303
# We add an exception for try builds (try branch) and unrolled rollup builds (try-perf), which
304304
# are all triggered on the same branch, but which should be able to run concurrently.
305-
group: ${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}
305+
group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}
306306
cancel-in-progress: true
307307

308308
jobs:

0 commit comments

Comments
 (0)