Improve release process for squash merge workflow#4
Merged
waynebrantley merged 2 commits intomainfrom Feb 1, 2026
Merged
Conversation
## Changes ### Updated release.sh - Creates a release branch instead of pushing to main - Creates a PR for the version bump - Defers tag creation until after PR merge - Saves release state for finalize step ### New finalize-release.sh - Runs after PR is merged - Creates tag on the correct squashed commit - Creates GitHub release - Ensures tag and main are aligned ### Workflow 1. Run: ./scripts/release.sh [type] - Creates PR with version bump - Waits for tests and merge 2. After PR merge, run: ./scripts/finalize-release.sh - Creates tag on merged commit - Creates GitHub release - Triggers npm publish This ensures tags always point to the same commit as main, even with squash merges.
- Stable releases (patch/minor/major) must be from main - Pre-releases (beta/alpha) can be from any branch - Pre-releases create tag immediately (no PR workflow) - Stable releases use PR workflow with finalize step
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
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.
Summary
Updates the release process to properly handle squash merges, ensuring tags always point to the same commit as main.
Problem
Previously, the release script would:
Solution
Split the release process into two steps:
Step 1:
release.shStep 2:
finalize-release.sh(after PR merge)Benefits
Testing
Workflow Example