about summary refs log tree commit diff
path: root/src/ci/github-actions
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2023-07-08 15:49:45 +0200
committerGitHub <noreply@github.com>2023-07-08 15:49:45 +0200
commite0b290f1a8dfd2cf6dbad94c0425f04f387842d1 (patch)
treed8facfb9c16d647e35b525f2d6d1e77522544b23 /src/ci/github-actions
parentb70c5538b6ceaa60a2fad44d1753f101b71e5584 (diff)
parentf88024627b80f07b175441eae52cf009702139de (diff)
downloadrust-e0b290f1a8dfd2cf6dbad94c0425f04f387842d1.tar.gz
rust-e0b290f1a8dfd2cf6dbad94c0425f04f387842d1.zip
Rollup merge of #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](https://github.com/rust-lang/rust/pull/113059#discussion_r1247213606).
Diffstat (limited to 'src/ci/github-actions')
-rw-r--r--src/ci/github-actions/ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 24fc72e660a..8027e699666 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -302,7 +302,7 @@ concurrency:
   # For a given workflow, if we push to the same branch, cancel all previous builds on that branch.
   # We add an exception for try builds (try branch) and unrolled rollup builds (try-perf), which
   # are all triggered on the same branch, but which should be able to run concurrently.
-  group: ${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}
+  group: ${{ github.workflow }}-${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}
   cancel-in-progress: true
 
 jobs: