Skip to content

ci(release): merge a release pull request only while main is unchanged #901

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
kvlonge merged 1 commit into from
Oct 1, 2026
Merged

ci(release): merge a release pull request only while main is unchanged #901

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
14 changes: 13 additions & 1 deletion .github/workflows/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,4 +215,16 @@ jobs:
# The delivery app merges, so the resulting push to main starts the tag and publish runs.
GH_TOKEN: ${{ steps.delivery-token.outputs.token }}
RELEASE_PR: ${{ needs.release-please.outputs.release_pr }}
run: gh pr merge "${RELEASE_PR}" --repo "${GITHUB_REPOSITORY}" --auto --squash
PROCESSED_SHA: ${{ github.sha }}
run: |
# A commit merged to main while these checks ran is not in this release pull request yet.
# Its own Release Please run is queued behind this one and refreshes and re-checks the
# pull request, so merging now would tag a release whose changelog omits that commit.
main_sha="$(gh api "repos/${GITHUB_REPOSITORY}/commits/main" --jq .sha)"
if [[ "${main_sha}" != "${PROCESSED_SHA}" ]]; then
gh pr merge "${RELEASE_PR}" --repo "${GITHUB_REPOSITORY}" --disable-auto 2>/dev/null || true
echo "main moved from ${PROCESSED_SHA} to ${main_sha}; leaving the merge to the queued run" \
>> "${GITHUB_STEP_SUMMARY}"
exit 0
fi
gh pr merge "${RELEASE_PR}" --repo "${GITHUB_REPOSITORY}" --auto --squash
Loading