chore: multiple release branches without merge conflicts #11287
Merged
Conversation
This file contains 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
As we prepare for 2.0, we need to release the CDK concurrently in multiple version lines (1.x and 2.0.0-alpha.x). In order to avoid merge conflicts of `lerna.json` and `CHANGELOG.md` between the v1 and v2 branches, we extracted the version number from `lerna.json` to `version.vNNN.json` and changelog to `CHANGELOG.vNNN.json` (1.0 is still CHANGELOG.md because it is tracked externally). A new file called `release.json` has been introduced and includes *static* information about which version line this branch serves. This allows us to avoid merge conflicts caused by version bumps between release branches. Updated the contribution guidelines to reflect this information.
|
|
eladb
commented
Nov 4, 2020
eladb
commented
Nov 4, 2020
RomainMuller
reviewed
Nov 4, 2020
added 3 commits
November 4, 2020 19:23
1. change majorVersion to number 2. remove "await"
introduced a private module under `scripts/script-tests` with jest tests for scripts.
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
RomainMuller
approved these changes
Nov 4, 2020
|
Thank you for contributing! Your pull request will be updated from master and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork). |
eladb
pushed a commit
that referenced
this pull request
Nov 4, 2020
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.
As we prepare for 2.0, we need to release the CDK concurrently in multiple version lines (1.x and 2.0.0-alpha.x).
In order to avoid merge conflicts of
lerna.jsonandCHANGELOG.mdbetween the v1 and v2 branches, we extracted the version number fromlerna.jsontoversion.vNNN.jsonand changelog toCHANGELOG.vNNN.json(1.0 is still CHANGELOG.md because it is tracked externally).A new file called
release.jsonhas been introduced and includes static information about which version line this branch serves. This allows us to avoid merge conflicts caused byversion bumps between release branches.
This change also cleans up some of the scripts related to versioning and bumps. The main bump script is now implemented in
scripts/bump.jsand interacts withstandard-versionas a library instead of through the CLI. To that end, the.versionrc.jsonfile was also removed.See CONTRIBUTING for more details about how this works.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license