Skip to content

Commit

Permalink
Wait before enabling auto-merge during update flow
Browse files Browse the repository at this point in the history
There seems to be a race condition, where creating a PR creates it in a mergeable state as actions haven't started yet, so auto-merge may just merge the PR immediately without waiting for them to succeed or fail. For now attempt to resolve this by waiting for a minute before enabling auto-merge.
  • Loading branch information
zeux authored Nov 21, 2024
1 parent 07ceea3 commit 6eaa674
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ jobs:
title: Update to 1.3.${{env.VOLK_VERSION}}
author: GitHub <[email protected]>
- name: enable pr automerge
run: gh pr merge --merge --auto ${{env.PULL_REQUEST_NUMBER}}
run: |
sleep 60
gh pr merge --merge --auto ${{env.PULL_REQUEST_NUMBER}}
env:
GH_TOKEN: ${{ github.token }}
continue-on-error: true

0 comments on commit 6eaa674

Please sign in to comment.