Document process for bumping dev-master branch-alias and bump to 1.10-dev #852
Conversation
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
jmikola
commented
Aug 6, 2021
CONTRIBUTING.md
Outdated
| @@ -124,9 +124,38 @@ The maintenance branch's HEAD will be the target for our release tag: | |||
| $ git tag -a -m "Release X.Y.Z" X.Y.Z | |||
| ``` | |||
|
|
|||
| ### Push tags | |||
| ### Update branch-alias for dev-master (major and minor releases only) | |||
There was a problem hiding this comment.
@tanlisu: See branch-alias for additional context.
alcaeus
requested changes
Aug 6, 2021
CONTRIBUTING.md
Outdated
Comment on lines
129
to
133
| Initial versions of new major or minor releases will likely be made on the | ||
| master branch directly instead of a maintenance branch. In this case, the | ||
| `branch-alias` for `dev-master` in `composer.json` should be updated. For | ||
| example, after tagging a new 1.10.0 release on the master branch, | ||
| `composer.json` in the master branch may still read: |
There was a problem hiding this comment.
Regardless of when releases are tagged, the branch-alias needs to be changed once we branch off. For example, after branching v1.10, the branch-alias for dev-master should be changed to 1.11.x.
There was a problem hiding this comment.
Good point. I'll move this to a separate section that talks about branching in that case.
jmikola
force-pushed
the
bump-branch-alias
branch
from
8ed2a25 to
69cad71
Compare
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.
This was missed after the 1.10.0 release.