Skip to content

Commit 556366d

Browse files
authored
Fix race condition with version bump action (#18150)
When handling multiple releases on the same schedule it is common to kick off this action across multiple branches. Using *only* the time for a branch name to create a PR for to update lock file results in a race condition where a target branch can conflict. In order to fix this we now include the target branch (logstash stream) in the branch name to raise the PR from.
1 parent 096f1a3 commit 556366d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/version_bumps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
- run: ./vendor/jruby/bin/jruby -S bundle update --all --${{ env.INPUTS_BUMP }} --strict
5252
- run: mv Gemfile.lock Gemfile.jruby-*.lock.release
5353
- run: echo "T=$(date +%s)" >> $GITHUB_ENV
54-
- run: echo "BRANCH=update_lock_${T}" >> $GITHUB_ENV
54+
- run: echo "BRANCH=update_lock_${{ env.INPUTS_BRANCH }}_${T}" >> $GITHUB_ENV
5555
- run: |
5656
git checkout -b $BRANCH
5757
git add .

0 commit comments

Comments
 (0)