Skip to content

fix: force-with-lease the bump branch so a stale one cannot fail the push #96

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
andychoquette merged 1 commit into from
Sep 23, 2026
Merged

fix: force-with-lease the bump branch so a stale one cannot fail the push #96

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
21 changes: 18 additions & 3 deletions .github/workflows/reusable_bump.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,22 @@ jobs:
# Pass context via env, not inline ${{ }}, to avoid template injection.
BASE_REF: ${{ github.ref_name }}
run: |
git push -u origin bump/$NEXT_SEMVER

# bump/$NEXT_SEMVER is recreated from $BASE_REF on every run, so a leftover branch
# from an earlier bump of this same version -- a release PR closed unmerged, then
# re-run after $BASE_REF moved on -- has diverged, and a plain push is rejected
# non-fast-forward. Forcing is safe because the branch only ever holds this run's
# generated release commit. --force-with-lease (not --force) still refuses if the
# remote moved after Checkout fetched it, which fetch-depth: 0 above guarantees a
# remote-tracking ref for. Deleting the remote branch instead would close any open
# release PR for it.
git push --force-with-lease -u origin "bump/$NEXT_SEMVER"

# A closed PR for this head does not block opening a new one, but an open one does,
# and the push above has already updated it.
# Needs "Allow GitHub Actions to create and approve pull requests" under Settings > Actions
gh pr create --base "$BASE_REF" --title "chore(release): $NEXT_SEMVER" --body "$RELEASE_NOTES"
EXISTING_PR=$(gh pr list --head "bump/$NEXT_SEMVER" --state open --json number --jq '.[0].number // empty')
if [[ -n "$EXISTING_PR" ]]; then
echo "bump/$NEXT_SEMVER already has open PR #$EXISTING_PR; the push above updated it."
else
gh pr create --base "$BASE_REF" --title "chore(release): $NEXT_SEMVER" --body "$RELEASE_NOTES"
fi
Loading