Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: add a retry on git push in merge-pr.sh #875

Merged
merged 1 commit into from
Jan 22, 2025
Merged

build: add a retry on git push in merge-pr.sh #875

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion scripts/merge-pr.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,13 @@ fi
# we can now actually merge this to main without breaking anything
git checkout main
git merge "$branch" --ff-only
git push

# In principle we can just push now, because we're just updating `main` to the tip of an approved branch.
# Github has magic to detect that!
# Unfortunately, the magic is sometimes laggy.
# So let's give it a shot, and if it doesn't work, we'll try again a few seconds later;
# that should minimize overall waiting.
if ! git push; then
sleep 2.5s
git push
fi
Loading