Skip to content

fix: open the PR for a bump branch that has none - #486

Merged
3alpha merged 4 commits into
dappnode:masterfrom
drptbl:fix/bump-upstream-orphan-branch
Nov 12, 2026
Merged

3alpha merged 4 commits into
dappnode:masterfrom
drptbl:fix/bump-upstream-orphan-branch

Conversation

@drptbl

@drptbl drptbl commented Nov 10, 2026

Copy link
Copy Markdown
Contributor

bump-upstream assumes an existing bump branch already has a PR. When the token isn't allowed to create pull requests, the branch gets pushed, PR creation fails, and every later run logs Branch ... already exists and passes. That's how https://github.com/xAlisher/logos-node-dappnode stayed on 0.3.1 while 0.3.2 and 0.3.4 shipped (https://github.com/xAlisher/logos-node-dappnode/actions/runs/41197630281).

Now a bump branch that exists on the remote with no PR in any state gets its PR opened. A branch whose PR was closed is still skipped, closing it was a decision.

@drptbl
drptbl requested a review from a team as a code owner November 10, 2026 12:35
@3alpha

3alpha commented Nov 11, 2026

Copy link
Copy Markdown
Member

Thanks for the fix! Two things need addressing before merging:

  • The recovery path bypasses the existing SKIP_COMMIT check. It needs to respect that flag so a debugging run doesn’t unexpectedly open a real PR.
  • Returning immediately after opening the PR skips the build/upload/comment steps, even when skip_build is false. Subsequent runs see the PR and skip it too, leaving it without an install-link comment. Recovery should continue those steps using the recovered branch’s checkout.

bump-upstream assumed an existing bump branch already had a PR, so a branch whose PR creation was refused (e.g. GitHub Actions not allowed to create pull requests) made every later run skip that release.
Recovery now checks the branch out, honours SKIP_COMMIT, and continues to closeOldPrs and the build, upload and comment steps instead of returning after opening the PR.
@drptbl
drptbl force-pushed the fix/bump-upstream-orphan-branch branch from 5a60880 to b21997f Compare November 11, 2026 10:59
@drptbl

drptbl commented Nov 11, 2026 •

Copy link
Copy Markdown
Contributor Author

@3alpha Thanks for checking 🙏. Both fixed in b21997f: recovery now checks the branch out and respects SKIP_COMMIT, then falls through to closeOldPrs and the build, upload and comment steps like a freshly pushed branch.

@3alpha
3alpha merged commit 9b7d87e into dappnode:master Nov 12, 2026
5 of 7 checks passed
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.

2 participants