[WIP] Platform Release: Improve patch and dev version support #188
Conversation
- prepare-platform-release-branch add options: - [-b <platform branch name>] - [--js <cordova-js branch or tag name>] - copy-js add option: - [--js <cordova-js branch or tag name>]
and fix tag-release usage
needed for cordova-osx (4.0.2-dev) & cordova-windows FUTURE TBD can we think of a better fix?
according to recent changes: - usage with non-master release branch - tag without automatic push
needed in case of commit prefix such as --pre='CB-12345 '
janpio
changed the title
What does this mean? Issue in a PR? #174 is already closed though!?
What strange cases?
What does this mean in the context of this PR? I don't get the connection. |
|
In general: I think this should not be 1 PR, but several that each do less things and have a clear problem description in the PR description (or link to an issue somewhere). Right now this is too much to understand and assign which problem is solved by which line of change. |
|
Thanks @janpio for reviewing. I have been keeping this branch to solve some mostly basic problems with making branch releases & dev versions. Unfortunately I haven't had so much time to go through and document the exact problems in better detail. I would like to finish with what I think are some urgent tasks remaining then can go through, document in more detail, and raise in separate PRs for review. Does that sound OK? |
brodycj
changed the title
|
Yep, not in a hurry - just wanted to make sure that all open questions to the changes being made are answered and we won't be mad in a year or so about that massive commit without all the necessary context ;) |
…ev-version-support
|
Hey @brodybits, after going through the release process documentation again to try to make sense of it (and possibly unify it for all repos), I think most of the actual changes on coho you suggest here make sense and might be worth splitting into individual PRs to be merged as soon as possible. (I am not sure about the Do you possibly have the time to fix the tiny merge conflict here and then split this into individual PRs? |
as suggested by @janpio Co-Authored-By: Jan Piotrowski <piotrowski+github@gmail.com>
(in place of XXX TBD ??? comments that were added before)
…patch-and-dev-version-support
src/platform-release.js
Outdated
| @@ -228,13 +228,15 @@ exports.prepareReleaseBranchCommand = function * () { | |||
| yield executil.execHelper(executil.ARGS('git checkout -b ' + branchName)); | |||
| } | |||
|
|
|||
| print(repo.repoName + ': Update JS snapshot version for VERSION "' + version + '" on branch "' + branchName + '".'); | |||
src/platform-release.js
Outdated
| yield updateJsSnapshot(repo, version, true); | ||
|
|
||
| print(repo.repoName + ': Setting VERSION to "' + version + '" on branch "' + branchName + '".'); | ||
| yield versionutil.updateRepoVersion(repo, version); | ||
|
|
||
| if (platform === 'ios') { | ||
| // Updates version in CDVAvailability.h file | ||
| print(repo.repoName + ': Update CDVAvailability.h for VERSION to "' + version + '" on branch "' + branchName + '".'); |
|
I just merged in the changes from I also rebased the changes with 7b54e27 and aefb169 removed: master...brodybits:pr-188-rebased Unfortunately I cannot promise when I will get a chance to split the changes as I am falling behind on some other commitments. |
should resolve issue on Travis CI
Platforms affected
All
What does this PR do?
TBD should be done more completely, in a separate PR:
TODO: these items should be done in a separate PR:
prepare iOSCDVAvailability.hafter updating JS in git (more sensical order)do not update iOSCDVAvailability.hif version number ends with non-numerical character, needed to avoid build error in case of marking -dev versionProposed items:
prepare-platform-release-branchadd options:[-b <platform branch name>][-js <cordova-js branch or tag name>]copy-jsadd option:[-js <cordova-js branch or tag name>]--tag-onlyoption totag-releasecommand (shows thegit pushcommands that can be done manually)git checkout -- package.json, needed for strange cases with cordova-osx (4.0.2-dev) & cordova-windows--preoption toprepare-platform-release-branchto allow specific prefix such as JIRA or GH number in the commit messagesThis proposal supersedes and resolves #174 (GH-174).
What testing has been done on this change?
GH-174 was successfully used for a number of patch releases including:
(updated usage as needed for the patch releases is shown in most of these PRs)
Additional changes to add the
--preoption & better deal with -dev version are demonstrated working in:Checklist
Reported an issue in the JIRA databaseCommit message follows the format: "CB-3232: (android) Fix bug with resolving file paths", where CB-xxxx is the JIRA ID & "android" is the platform affected.Added automated test coverage as appropriate for this change.