[WIP] CB-14249 ensure platform changes are in a dev version (partial workaround doc fix) #189
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
janpio
reviewed
Aug 2, 2018
| @@ -122,6 +123,10 @@ Double check you replace "Android" in the subject and mail body - there is no un | |||
|
|
|||
| Note that it would be possible to continue with some of the [Before Release](#before-release) items while waiting for a possible response. | |||
|
|
|||
| ### Ensure changes are in a dev version | |||
|
|
|||
| The procedure described here may leave non-master branch with a non-dev version number. Functional changes should always be done in a "-dev" version. Please mark the "-dev" version manually or using cordova-coho before making changes, and test it especially when marking "-dev" version manually. | |||
There was a problem hiding this comment.
What is the cordova-coho command to use?
Where does one have to change things when doing this manually?
There was a problem hiding this comment.
(Sorry about being pedantic here, but I guess you probably have this information handy)
brodycj
changed the title
|
Thanks @janpio for the feedback. I would definitely agree that the command is missing and that we should get rid of "manually". The thing is that I think we really need some of the changes I proposed in #188 for the coho command to work in the release branch. I just updated the description with this info. There a few things I want to do first, major one is to finish the Cordova patch release before cleaning up #188. Keeping this one as "WIP" for now. |
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.
Platforms affected
All
What does this PR do?
Add section with note to ensure that changes are made in a "-dev" version.
This is a partial workaround for the fundamental issue in CB-14249, contributed in response to the discussion in apache/cordova-android#469. This kind of workaround was already applied in apache/cordova-android#470, apache/cordova-ios#379, apache/cordova-android#454, and several other places.
I hope we can resolve the inconsistency in release procedure for platforms vs tools described in CB-14249 someday, with agreement via dev@cordova.apache.org. I cannot promise when I will get a chance to take care of this.
TODO:
cohocommandUnfortunately I think I need some of the changes from #188 to make the
coho prepare-platform-release-branchcommand work as needed on the non-master branch. I hope I get a chance to cleanup some of the changes from #188 and fix this one in the near future.Merge procedure
What testing has been done on this change?
Checklist
Added automated test coverage as appropriate for this change.