cordova-coho icon indicating copy to clipboard operation
cordova-coho copied to clipboard

[WIP] Platform Release: Improve patch and dev version support

Open brody4hire opened this issue 6 years ago • 6 comments

Platforms affected

All

What does this PR do?

TBD should be done more completely, in a separate PR:

  • fix usage messages

TODO: these items should be done in a separate PR:

  • ~~prepare iOS CDVAvailability.h after updating JS in git (more sensical order)~~
  • ~~do not update iOS CDVAvailability.h if version number ends with non-numerical character, needed to avoid build error in case of marking -dev version~~

Proposed items:

  • workaround for local grunt issue in cordova-js from PR #174 (hope to look into a more "real" solution, someday, will probably comment more in #174)
  • Updates to improve support for patch releases (see rationale in PR #176)
    • 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>]
  • Add --tag-only option to tag-release command (shows the git push commands that can be done manually)
  • EXTRA GIT WORKAROUND solution to do git checkout -- package.json, needed for strange cases with cordova-osx (4.0.2-dev) & cordova-windows
  • show slightly modified commit message in case version is updated in package.json
  • add --pre option to prepare-platform-release-branch to allow specific prefix such as JIRA or GH number in the commit messages
  • remove some extra info from commit messages
  • other minor fixes

This 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:

  • apache/cordova-browser#55 - CB-14230 patch release 5.0.4
  • apache/cordova-osx#51 - CB-14228 release 4.0.2
  • apache/cordova-windows#287 - CB-14226 [email protected] (July 2018 patch release)
  • apache/cordova-ios#381 - CB-14217 cordova-ios 4.5.5 patch release (July 2018)
  • apache/cordova-android#467 - CB-14203 patch release
  • apache/cordova-osx#50 - CB-14145 resolve npm audit issues in patch fix
  • apache/cordova-windows#281 - CB-14145 resolve npm audit issues in patch fix
  • apache/cordova-ios#379 - CB-14145 resolve npm audit issues in 4.5.x patch fix
  • apache/cordova-android#451 - CB-14145: cordova-common update to resolve npm audit & other updates in patch release
  • apache/cordova-browser#53 - CB-14145 resolve npm audit issues in patch release

(updated usage as needed for the patch releases is shown in most of these PRs)

Additional changes to add the --pre option & better deal with -dev version are demonstrated working in:

  • apache/cordova-ios#387 - CB-14244 start 5.0.0-dev in master branch (includes updated command usage that was used there)

Checklist

  • ~~Reported an issue in the JIRA database~~
  • ~~Commit 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.~~

brody4hire avatar Aug 02 '18 01:08 brody4hire