Chore: Only reset to upstream/master for major/minor releases #750
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
|
Verified that @pramodsum has signed the CLA. Thanks for the pull request! |
DanDeMicco
reviewed
Mar 29, 2018
| fi | ||
|
|
||
| # Reset and fetch upstream with tags | ||
| reset_tags || return 1; |
There was a problem hiding this comment.
If you end up staying with this approach, I would log a message to the teminal saying what you did
jeremypress
reviewed
Mar 30, 2018
build/release.sh
Outdated
| @@ -44,6 +78,14 @@ increment_version() { | |||
| # Old version | |||
| OLD_VERSION=$(./build/current_version.sh) | |||
|
|
|||
| # The master branch should not match the previous release tag | |||
There was a problem hiding this comment.
This isn't necessarily the master branch right? If we're coming from a patch this would be some detached state.
jeremypress
approved these changes
Mar 30, 2018
pramodsum
added a commit
to pramodsum/box-annotations
that referenced
this pull request
Apr 3, 2018
- This will prevent patch releases from resetting to upstream/master. Instead, it will reset to the previous version of Preview (if available). - See box/box-content-preview#750
pramodsum
added a commit
to box/box-annotations
that referenced
this pull request
Apr 5, 2018
- This will prevent patch releases from resetting to upstream/master. Instead, it will reset to the previous version of Preview (if available). - See box/box-content-preview#750
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 will prevent patch releases from resetting to upstream/master. Instead, it will reset to the previous version of Preview (if available).
TODO: replicate the same logic in BoxAnnotations
Copy of #745