feat(node-release): sync stable back to develop/staging - #66
Merged
Conversation
…ease semantic-release runs independently per branch (develop/staging/main) via this workflow, each committing its own version bump directly to that branch. Without a sync step, develop/staging permanently diverge from main's bump commits and every later promotion PR conflicts on package.json/CHANGELOG.md. Adds opt-in sync_develop_after_stable and sync_staging_after_stable inputs (default false) that merge main back down after a stable release, mirroring the existing sync_develop_after_stable step in docker-release.yml.
JSisques
added a commit
to sisques-labs/nestjs-kit
that referenced
this pull request
Aug 31, 2026
#138) semantic-release runs independently per branch here, each committing its own version bump (package.json/CHANGELOG.md) with no relation to the others, so develop/staging permanently diverged from main and every later promotion PR conflicted on those files. node-release.yml now supports merging main back down after a stable release (sisques-labs/workflows#66); opt in via sync_develop_after_stable and sync_staging_after_stable.
JSisques
added a commit
to sisques-labs/react-kit
that referenced
this pull request
Aug 31, 2026
#4) semantic-release runs independently per branch here, each committing its own version bump (package.json/CHANGELOG.md) with no relation to the others, so develop/staging permanently diverged from main and every later promotion PR conflicted on those files. node-release.yml now supports merging main back down after a stable release (sisques-labs/workflows#66); opt in via sync_develop_after_stable and sync_staging_after_stable.
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.
Summary
node-release.ymlruns semantic-release independently on each ofdevelop/staging/main(seenestjs-kitandreact-kit, its only two consumers). Each branch gets its own version-bump commit (package.json/CHANGELOG.md) with no relation to the others, sodevelop/stagingpermanently diverge frommainand every later promotion PR conflicts on those same lines.docker-release.ymlalready solves this for the release-train flow viasync_develop_after_stable. This PR adds the equivalent tonode-release.yml: opt-insync_develop_after_stableandsync_staging_after_stableinputs (defaultfalse, so no behavior change for existing callers) that mergemainback intodevelop/stagingright after a stable release actually publishes.Test plan
yaml.safe_load)nestjs-kitopts in viasync_develop_after_stable: true/sync_staging_after_stable: truein itsci.ymland confirms the nextmainrelease produces achore(release): sync stable from mainmerge commit ondevelop/stagingreact-kitcan opt in the same way; not enabled by default so it's unaffected until it does