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

CB-14244 start 5.0.0-dev in master branch #387

Merged
merged 3 commits into from
Aug 2, 2018

Conversation

brodycj
Copy link
Contributor

@brodycj brodycj commented Aug 2, 2018

Platforms affected

iOS

What does this PR do?

As agreed in this dev@cordova.apache.org thread:

Start 5.0.0-dev (next major version) in master branch using the following command (with cordova-coho updates from brodybits/cordova-coho - improve-patch-and-dev-version-support branch:

./cordova-coho/coho prepare-platform-release-branch --version 5.0.0-dev -r ios --js 4.2.3 --pre 'CB-14244 '

with new flags to note:

  • --js value to avoid including new updates from cordova-js at the same time
  • --pre value to mark the commits with the corresponding JIRA number

Also update cordova.js with recent change from cordova-js@4.2.4 in a separate commit, with help from the following command:

./cordova-coho/coho copy-js -r ios -js 4.2.4

Merge instructions

  • To be merged by pushing these commits directly to master branch

What testing has been done on this change?

  • able to try adding to a blank project using cordova platform add github:brodybits/cordova-ios#cb-14244-start-5.0.0-dev-master and then run on simulator
  • npm test succeeds on Travis CI

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.

@codecov-io
Copy link

codecov-io commented Aug 2, 2018

Codecov Report

Merging #387 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #387   +/-   ##
=======================================
  Coverage   65.62%   65.62%           
=======================================
  Files          14       14           
  Lines        1702     1702           
  Branches      286      286           
=======================================
  Hits         1117     1117           
  Misses        585      585

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b3f4bbb...84e12db. Read the comment docs.

@brodycj brodycj merged commit 84e12db into apache:master Aug 2, 2018
@brodycj brodycj deleted the cb-14244-start-5.0.0-dev-master branch August 2, 2018 01:30
@brodycj
Copy link
Contributor Author

brodycj commented Aug 2, 2018

Quick merge was done to unblock some other work.

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