diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e345964660d..ff62e1ded61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ defaults: run: shell: bash concurrency: - group: "${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}" + group: "${{ ((github.ref == 'refs/heads/try' || github.ref == 'refs/heads/try-perf') && github.sha) || github.ref }}" cancel-in-progress: true jobs: pr: diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index e5487b3e746..cb12042c117 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -299,9 +299,10 @@ defaults: shell: bash concurrency: - # For a given workflow, if we push to the same PR, cancel all previous builds on that PR. - # If the push is not attached to a PR, we will cancel all builds related to the same commit SHA. - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }} + # 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 }} cancel-in-progress: true jobs: