mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #113059 - Kobzol:ci-concurrency-fix, r=pietroalbini

Browse Source 
CI: do not cancel concurrent builds on the same branch

Do not cancel concurrent builds on the same branch (outside of PRs).

Instead, only cancel them if the builds have the same commit SHA.

From the [documentation](https://docs.github.com/en/actions/learn-github-actions/contexts#github-context):
> The commit SHA that triggered the workflow. The value of this commit SHA depends on the event that triggered the workflow. For more information, see "[Events that trigger workflows](https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows)." For example, ffac537e6cbbf934b08745a378932722df287a53.

Fixes: https://github.com/rust-lang/rust/pull/112955#discussion_r1242273658

r? `@pietroalbini`
This commit is contained in:
bors 2023-06-29 18:18:52 +00:00
commit b23a5add09
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -31,7 +31,7 @@ defaults:
run: run:
shell: bash shell: bash
concurrency: concurrency:
group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}" group: "${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}"
cancel-in-progress: true cancel-in-progress: true
jobs: jobs:
pr: pr:

7
src/ci/github-actions/ci.yml
View File

@ -299,9 +299,10 @@ defaults:
shell: bash shell: bash
concurrency: concurrency:
# For a given workflow, if we push to the same PR, cancel all previous builds on that PR. # For a given workflow, if we push to the same branch, cancel all previous builds on that branch.
# If the push is not attached to a PR, we will cancel all builds related to the same commit SHA. # We add an exception for try builds (try branch) and unrolled rollup builds (try-perf), which
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} # 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 }}
cancel-in-progress: true cancel-in-progress: true
jobs: jobs: