From 84dc9582ae6a280e8d35a48f849b3b96fc879654 Mon Sep 17 00:00:00 2001 From: Kayode Bristol Date: Tue, 11 Aug 2026 00:19:50 -0700 Subject: [PATCH 1/2] fix(release): fast-forward bootstrap branch --- .github/workflows/release-reusable.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-reusable.yml b/.github/workflows/release-reusable.yml index eecf176..4fdfaf2 100644 --- a/.github/workflows/release-reusable.yml +++ b/.github/workflows/release-reusable.yml @@ -655,8 +655,14 @@ jobs: -f "sha=${{ steps.release_base.outputs.sha }}" fi - git switch -c "$BRANCH" - git push --force-with-lease origin "HEAD:$BRANCH" + git switch -c "$BRANCH" + # The API call above may have created this ref in the remote after + # the checkout was fetched. A lease would then reject the first + # push because the runner has no local tracking value for it. + # This commit is based on release_base, so an ordinary push is the + # safe fast-forward operation and still rejects an unexpected + # remote update. + git push origin "HEAD:$BRANCH" PR_URL=$(gh pr list --repo "${{ github.repository }}" --head "$BRANCH" --base "$BASE" --state open --json url --jq '.[0].url') if [ -z "$PR_URL" ]; then From b9e695d7c75303ddd95ed72c932bdeb02eeeae4b Mon Sep 17 00:00:00 2001 From: Kayode Bristol <3579196+kayodebristol@users.noreply.github.com> Date: Tue, 11 Aug 2026 00:26:23 -0700 Subject: [PATCH 2/2] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .github/workflows/release-reusable.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-reusable.yml b/.github/workflows/release-reusable.yml index 4fdfaf2..7727264 100644 --- a/.github/workflows/release-reusable.yml +++ b/.github/workflows/release-reusable.yml @@ -655,14 +655,14 @@ jobs: -f "sha=${{ steps.release_base.outputs.sha }}" fi - git switch -c "$BRANCH" - # The API call above may have created this ref in the remote after - # the checkout was fetched. A lease would then reject the first - # push because the runner has no local tracking value for it. - # This commit is based on release_base, so an ordinary push is the - # safe fast-forward operation and still rejects an unexpected - # remote update. - git push origin "HEAD:$BRANCH" + git switch -c "$BRANCH" + # The API call above may have created this ref in the remote after + # the checkout was fetched. `git push --force-with-lease` would then + # reject the first push because the runner has no local tracking value. + # This commit is based on the release base SHA, so an ordinary push is + # the safe fast-forward operation and still rejects an unexpected + # remote update. + git push origin "HEAD:$BRANCH" PR_URL=$(gh pr list --repo "${{ github.repository }}" --head "$BRANCH" --base "$BASE" --state open --json url --jq '.[0].url') if [ -z "$PR_URL" ]; then