Skip to content

ci: handle updated current-main release PR heads - #1039

Merged
ch4r10t33r merged 1 commit into
mainfrom
fix/auto-release-updated-release-head
Jul 13, 2026
Merged

ci: handle updated current-main release PR heads#1039
ch4r10t33r merged 1 commit into
mainfrom
fix/auto-release-updated-release-head

Conversation

@zclawz

@zclawz zclawz commented Jul 13, 2026

Copy link
Copy Markdown
Contributor

Fixes the release workflow failure seen in #1037 / run 29268398422.

The failed run checked out PR head d2b4d84, a merge commit created when the release branch had been updated against main before squash merge. Its tree matched current main, but the workflow tried to publish the merge commit itself and failed the reachability guard.

This keeps the existing empty-release-commit behavior and adds a current-main fallback: when the PR head is a merge commit whose tree equals origin/main, publish origin/main as the release commit.

@zclawz

zclawz commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

Working this failure from release PR #1037 / run 29268398422. The failing payload checked out a merge-style release head (d2b4d84) whose tree matched current main, but the workflow tried to publish that merge commit and failed the reachability guard. This PR keeps the normal empty release commit path and adds a current-main fallback for that updated-release-branch shape. Locally checked the resolver against d2b4d84; it resolves to current main (b8bf1b3) and passes reachability.

@zclawz zclawz mentioned this pull request Jul 13, 2026
@ch4r10t33r
ch4r10t33r merged commit 8ca1b67 into main Jul 13, 2026
14 checks passed
@ch4r10t33r
ch4r10t33r deleted the fix/auto-release-updated-release-head branch July 13, 2026 18:56
@zclawz zclawz mentioned this pull request Jul 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants