fix: add code-carry merge step to release-please workflow#175
Merged
Conversation
release-please creates PRs with only version bumps (CHANGELOG, build.gradle.kts, README). The actual SDK code changes on `next` were never included in the release PR, so master got version bumps without code changes. This adds a 'Merge next code into release PR' step that merges `next` into the release PR branch after release-please creates it. Uses the pr_number output directly (with retry fallback) to avoid GitHub API eventual-consistency race conditions. Same fix as PR #440 on telnyx-node.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
release-please creates PRs with only version bumps (CHANGELOG, build.gradle.kts, README). The actual SDK code changes on
nextwere never included in the release PR.Result: PR #174 has only 4 files — no SDK code. Merging it would publish a Maven artifact with the new version number but old code.
Fix
Adds a "Merge next code into release PR" step (same as PR #440 on
telnyx-node):nextinto the release PR branchpr_numberoutput directly from release-please (avoids GitHub API race condition)gh pr listwith 3 retries (5s interval)-X ourson conflicts prefers release-please's version bumpsEvidence
Parity
Same pattern as TypeScript SDK (telnyx-node PR #437 + #440).