ci(release): sync main back into develop/staging after stable releases - #4
Merged
Merged
Conversation
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 was referenced Aug 31, 2026
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
nestjs-kit(ci(release): sync main back into develop/staging after stable releases nestjs-kit#138):semantic-releaseruns independently ondevelop/staging/mainvianode-release.yml, each committing its own version bump (package.json/CHANGELOG.md) directly to that branch with no relation to the others, so promotingdevelop → staging(orstaging → main) kept conflicting on those same files.node-release.ymlnow supports mergingmainback intodevelop/stagingright after a stable release actually publishes (sisques-labs/workflows#66, merged).sync_develop_after_stable: trueandsync_staging_after_stable: true.Test plan
mainproduces achore(release): sync stable from mainmerge commit ondevelopandstagingdevelop → stagingpromotion PR after that has no conflicts onpackage.json/CHANGELOG.md