Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve patch release support #176

Closed

Conversation

brodycj
Copy link

@brodycj brodycj commented Jul 4, 2018

Platforms affected

All

What does this PR do?

Updates to improve support for patch releases:

  • 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>]

Enables the following:

  • mark platform version in non-master patch branch, without extremely ugly workaround solution
  • use exact cordova-js version at every point so that the developer can control exactly which version of cordova-js is used by copy-js and coho prepare-platform-release-branch, without extremely ugly workaround solution

Other changes included:

What testing has been done on this change?

Tested on 4.5.x branch in my fork of cordova-ios, results in cb-4.5.x-coho-patch-update-test tree of my fork of cordova-ios:

  • ./cordova-coho/coho prepare-platform-release-branch -r ios --version 4.5.5-dev -b 4.5.x --js 4.2.3 resulted in the following changes (without unwanted change to CDVAvailability.h):
  • ./cordova-coho/coho copy-js -r ios --js 4.2.4 copies the actual update to cordova.js (brodycj/cordova-ios@4e53cd2)
  • ./cordova-coho/coho prepare-platform-release-branch -r ios --version 4.5.5 -b 4.5.x --js 4.2.4 results in the following changes for 4.5.5 release (no not a real release):

TODO items:

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.

@brodycj
Copy link
Author

brodycj commented Jul 23, 2018

Added --tag-only option to prepare-platform-release-branch command since I would rather push the changes myself. Also rebased the changes on master.

Christopher J. Brody added 8 commits July 27, 2018 15:47
- 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>]
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
@janpio
Copy link
Member

janpio commented Aug 10, 2018

Is this PR ready to be reviewed? If not, please prefix the PR title with [WIP]. Thank you.

Copy link
Member

@janpio janpio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general it would be beneficial if the different changes (new options, usage messages/docs, CDVAvailability.h, workarounds) were in clean, separate PRs.

@brodycj
Copy link
Author

brodycj commented Aug 10, 2018

Closing in favor of changes in #188 which is in WIP state.

@brodycj brodycj closed this Aug 10, 2018
@brodycj brodycj deleted the cb-improve-patch-release-support branch November 30, 2018 14:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants