diff options
| author | bors <bors@rust-lang.org> | 2023-07-08 18:36:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-08 18:36:58 +0000 |
| commit | d1389b9b4895e52ec7d1859a2d86e96babfb5d76 (patch) | |
| tree | f5c8b9c9a3870f790de153624c13b0298a28ff7a /src/ci/github-actions | |
| parent | 4353b1ecd65d493c9f503aacff07a3f98d0b0340 (diff) | |
| parent | 39f558f8cf0174493ed6c81de11ec372de3d0849 (diff) | |
| download | rust-d1389b9b4895e52ec7d1859a2d86e96babfb5d76.tar.gz rust-d1389b9b4895e52ec7d1859a2d86e96babfb5d76.zip | |
Auto merge of #113484 - matthiaskrgr:rollup-goq2u0d, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #112931 (Enable zlib in LLVM on aarch64-apple-darwin) - #113158 (tests: unset `RUSTC_LOG_COLOR` in a test) - #113173 (CI: include workflow name in concurrency group) - #113335 (Reveal opaques in new solver) - #113390 (CGU formation tweaks) - #113399 (Structurally normalize again for byte string lit pat checking) - #113412 (Add basic types to SMIR) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/ci.yml | 2 |
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: |