Skip to content

TRU-329: Rebase-and-retry on auto-bump push races #2

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

Merged
jtcrde merged 1 commit into from
Aug 12, 2026
Merged

TRU-329: Rebase-and-retry on auto-bump push races #2

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
12 changes: 11 additions & 1 deletion .github/workflows/update-source-reference.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,16 @@ jobs:
fi
else
echo "Major version was not changed, merging to ${DEFAULT_BRANCH}"
git push origin "$DEFAULT_BRANCH"
# Concurrent package releases race on this push (no shared lock across
# repos) — rebase and retry instead of failing on non-fast-forward.
for attempt in 1 2 3; do
if git push origin "$DEFAULT_BRANCH"; then
break
fi
echo "Push rejected (attempt $attempt) — rebasing onto latest $DEFAULT_BRANCH"
git fetch origin "$DEFAULT_BRANCH"
git rebase "origin/$DEFAULT_BRANCH"
[ "$attempt" = "3" ] && { echo "::error::Push failed after 3 attempts"; exit 1; }
done
fi
popd
Loading