Skip to content

fix(release): open a release PR into base instead of blocking on merge#26

Merged
GoogilyBoogily merged 2 commits into
mainfrom
fix/release-pr-open-pr-no-block
Jul 17, 2026
Merged

fix(release): open a release PR into base instead of blocking on merge#26
GoogilyBoogily merged 2 commits into
mainfrom
fix/release-pr-open-pr-no-block

Conversation

@GoogilyBoogily

Copy link
Copy Markdown
Contributor

Summary

The release pipeline opened a version-bump PR into the base branch and then blocked in the same run waiting for that PR to merge. The base requires review, so the wait always timed out and no release ever completed. Version-bump now bumps on a throwaway branch, opens the PR, and stops. A human approves and merges it, and the merge is what triggers deploy downstream.

Changes

  • version-bump checks out base on a throwaway release-bump/v-<run_id> branch (no long-lived release branch, no merging base into it).
  • release-pr pushes that branch and opens a PR into base, then exits. Dropped the merge-wait poll, the release-branch push, the pre-merge tag, and the auto-merge call.
  • Rebuilt dist/release-pr.js.

Test plan

  • npm run typecheck && npm run build is clean and dist/ stays in sync (validate-scripts).
  • A consumer dispatch with dry-run: true validates and computes the version, with no branch push or PR.
  • A real dispatch opens a Release vX.Y.Z PR into base and the job exits without polling for its own merge.

Version-bump now bumps on a throwaway release-bump/v-<run_id> branch and
opens a PR into the base branch, then stops. It no longer polls for its own
merge, pushes a long-lived release branch, or tags pre-merge. A human
approves and merges the PR, and the merge triggers deploy downstream.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR adjusts the release pipeline behavior so the automation opens a version-bump PR into the base branch and exits, instead of blocking in the same run waiting for the PR to be merged (which times out on protected branches).

Changes:

  • version-bump now checks out base on a per-run throwaway release-bump/v-<run_id> branch (no long-lived release branch).
  • release-pr now pushes that bump branch and opens a PR into base, without polling for merge or attempting auto-merge/tagging.
  • Action metadata updated to reflect the new flow.

Reviewed changes

Copilot reviewed 2 out of 3 changed files in this pull request and generated 1 comment.

File Description
src/release-pr.ts Pushes the bump branch and opens a PR into the base branch (removes waiting/auto-merge/tag steps).
actions/version-bump/action.yml Switches to a throwaway bump branch and passes BUMP_BRANCH through to the PR-opening step.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/release-pr.ts

@adrmachado-public adrmachado-public left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generally LGTM!

Comment thread actions/version-bump/action.yml Outdated
…uard

Addresses review on #26.

- Rename the throwaway branch release-bump/v-<run_id> to release-bump-<run_id>.
  The slash form fails consumer branch-name validation (e.g. braintree.js
  scripts/hooks/validate-branch-name.js), so the hyphen form is valid everywhere
  and needs no per-repo exceptions.
- Remove the dead dry-run guard in release-pr.ts. The version-bump action gates
  the Open the release PR step with 'if: dry-run != false', so release-pr.js only
  runs on real releases and the guard could never trigger.
@GoogilyBoogily
GoogilyBoogily merged commit 08e2c6a into main Jul 17, 2026
1 check passed
@GoogilyBoogily
GoogilyBoogily deleted the fix/release-pr-open-pr-no-block branch July 17, 2026 14:54
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.

4 participants