Skip to content

Commit bd6dcfe

Browse files
authored
fix: concurrency of automerge (#354)
prevent premature merge by enforcing ordering of actions
1 parent d8213af commit bd6dcfe

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

.github/workflows/automerge-global.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,16 @@ on:
1111
type: string
1212
default: app/renovate
1313

14+
# Ensure only one instance of this workflow runs per PR at a time.
15+
# With cancel-in-progress: false, new runs wait for previous ones to complete
16+
# instead of cancelling them. This prevents race conditions when multiple commits
17+
# are pushed quickly (e.g., by Renovate rebasing), ensuring each commit's checks
18+
# finish before the next automerge attempt starts.
19+
# See example: https://github.com/camunda/camunda-deployment-references/pull/1352
20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.ref }}
22+
cancel-in-progress: false
23+
1424
jobs:
1525
# do not change the name
1626
approve-and-auto-merge:

0 commit comments

Comments
 (0)