Skip to content

Commit 783da69

Browse files
authored
[CI] Fix concurrency group for automerge jobs (#122409)
* [CI] Move concurrency group inside automerge job
1 parent d99b559 commit 783da69

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

.github/workflows/automerge.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@ env:
2222
# https://github.com/JuliaRegistries/RegistryCI.jl/blob/ee1d7cdb165202f4f3929a122c3188fbdd7afc16/src/AutoMerge/ciservice.jl#L53-L67
2323
NEED_MERGE_TOKEN: ${{ github.ref == 'refs/heads/master' && (github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') }}
2424

25-
concurrency:
26-
# Skip intermediate builds: always.
27-
# Cancel intermediate builds: only pull request builds
28-
group: ${{ github.workflow }}-${{ github.ref }}
29-
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
30-
3125
jobs:
3226
AutoMerge:
3327
# Run if:
@@ -40,6 +34,11 @@ jobs:
4034
if: "${{ github.event_name != 'pull_request' || (github.repository == github.event.pull_request.head.repo.full_name && (github.event.action != 'labeled' || (github.event.action == 'labeled' && (github.event.label.name == 'Override AutoMerge: name similarity is okay' || github.event.label.name == 'Override AutoMerge: package author approved')))) }}"
4135
timeout-minutes: 60
4236
runs-on: ${{ matrix.os }}
37+
concurrency:
38+
# Skip intermediate builds: always.
39+
# Cancel intermediate builds: only pull request builds
40+
group: automerge-${{ github.ref }}
41+
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
4342
strategy:
4443
matrix:
4544
version:

0 commit comments

Comments
 (0)