Master => develop #6765
Merged
Master => develop #6765
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
Merge develop into master
Update master branch with develop (v6.4.0)
Update master with 6.4.1 Release
Master Version Bump (v6.5.0)
Update master for 6.5.2 production release
Merge dev to master
Develop to master
Version 6.6.2
…irmTransaction state.
Version 6.7.1
|
Publish release script error:
|
tmashuang
previously approved these changes
Jun 28, 2019
The MetaMask bot is currently failing to publish docs updates, and it is [blocking our ability to release new versions](#6765). While we should pursue a proper fix, I think it's worth disabling in the meanwhile so this glitch doesn't interfere with our regular release cadence further.
Disable release script from CircleCI
tmashuang
reviewed
Jul 1, 2019
tmashuang
approved these changes
Jul 1, 2019
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.
Bring version bumps up into
develop.Opening this largely to see if this flow could be feasible, and what it might look like:
mastermasteris regularly merged back intodevelop.This way,
developonly gets its version info frommaster, and version info is only created on RC branches.Downside: We get all these merge pull request commits. Also if we squash & merge this (our default automatic merge option), we probably won't be able to merge it again automatically.