[GitHub] janpio commented on a change in pull request #170: CB-13828: Improve cordova-coho/docs
janpio commented on a change in pull request #170: CB-13828: Improve
cordova-coho/docs
URL: https://github.com/apache/cordova-coho/pull/170#discussion_r170231174
##
File path: docs/platforms-release-process.md
##
@@ -86,30 +157,46 @@ Ensure all dependencies and subdependencies have
Apache-compatible licenses.
coho check-license -r android
## Prepare Release
-Increase the version within package.json using SemVer, and remove the `-dev`
suffix.
+
+### Remove the `-dev` suffix from version
+
+This command removes `-dev` from the `version` entry in `package.json`:
for l in cordova-android; do ( cd $l; v="$(grep '"version"' package.json |
cut -d'"' -f4)"; if [[ $v = *-dev ]]; then v2="${v%-dev}"; echo "$l: Setting
version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json;
fi) ; done
-In `cordova-android`, also remember to bump the version in
`framework/build.gradle`.
+Note: This command [doesn't actually
work](https://issues.apache.org/jira/browse/CB-13809). You can also replace
`-dev` manually of course.
-If the changes merit it, manually bump the major / minor/ patch version in
`package.json`. View the changes via:
+Note: In `cordova-android`, also remember to handle the version in
`framework/build.gradle`.
Review comment:
Ah, now I finally got it I think. Updated the file to document this in more
detail:
https://github.com/apache/cordova-coho/pull/170/commits/efe62e3d9d56b6458bc323214926c4efa747c175
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
[GitHub] janpio commented on a change in pull request #170: CB-13828: Improve cordova-coho/docs
janpio commented on a change in pull request #170: CB-13828: Improve
cordova-coho/docs
URL: https://github.com/apache/cordova-coho/pull/170#discussion_r170092765
##
File path: docs/platforms-release-process.md
##
@@ -86,30 +157,46 @@ Ensure all dependencies and subdependencies have
Apache-compatible licenses.
coho check-license -r android
## Prepare Release
-Increase the version within package.json using SemVer, and remove the `-dev`
suffix.
+
+### Remove the `-dev` suffix from version
+
+This command removes `-dev` from the `version` entry in `package.json`:
for l in cordova-android; do ( cd $l; v="$(grep '"version"' package.json |
cut -d'"' -f4)"; if [[ $v = *-dev ]]; then v2="${v%-dev}"; echo "$l: Setting
version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json;
fi) ; done
-In `cordova-android`, also remember to bump the version in
`framework/build.gradle`.
+Note: This command [doesn't actually
work](https://issues.apache.org/jira/browse/CB-13809). You can also replace
`-dev` manually of course.
-If the changes merit it, manually bump the major / minor/ patch version in
`package.json`. View the changes via:
+Note: In `cordova-android`, also remember to handle the version in
`framework/build.gradle`.
+
+### Increase version
+
+If the changes merit it, **manually** bump the major / minor/ patch version in
`package.json`.
+
+To decide if this release merits it, view the changes via:
( cd cordova-android && git log --pretty=format:'* %s' --topo-order
--no-merges $(git describe --tags $(git rev-list --tags --max-count=1))..master
)
+Note: This command [doesn't actually
work](https://issues.apache.org/jira/browse/CB-13901). You can also check out
the changes manually (or via the next step).
Review comment:
Indeed, it works in WSL. Will update the text.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
[GitHub] janpio commented on a change in pull request #170: CB-13828: Improve cordova-coho/docs
janpio commented on a change in pull request #170: CB-13828: Improve
cordova-coho/docs
URL: https://github.com/apache/cordova-coho/pull/170#discussion_r170092319
##
File path: docs/platforms-release-process.md
##
@@ -86,30 +157,46 @@ Ensure all dependencies and subdependencies have
Apache-compatible licenses.
coho check-license -r android
## Prepare Release
-Increase the version within package.json using SemVer, and remove the `-dev`
suffix.
+
+### Remove the `-dev` suffix from version
+
+This command removes `-dev` from the `version` entry in `package.json`:
for l in cordova-android; do ( cd $l; v="$(grep '"version"' package.json |
cut -d'"' -f4)"; if [[ $v = *-dev ]]; then v2="${v%-dev}"; echo "$l: Setting
version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json;
fi) ; done
-In `cordova-android`, also remember to bump the version in
`framework/build.gradle`.
+Note: This command [doesn't actually
work](https://issues.apache.org/jira/browse/CB-13809). You can also replace
`-dev` manually of course.
-If the changes merit it, manually bump the major / minor/ patch version in
`package.json`. View the changes via:
+Note: In `cordova-android`, also remember to handle the version in
`framework/build.gradle`.
+
+### Increase version
+
+If the changes merit it, **manually** bump the major / minor/ patch version in
`package.json`.
+
+To decide if this release merits it, view the changes via:
( cd cordova-android && git log --pretty=format:'* %s' --topo-order
--no-merges $(git describe --tags $(git rev-list --tags --max-count=1))..master
)
+Note: This command [doesn't actually
work](https://issues.apache.org/jira/browse/CB-13901). You can also check out
the changes manually (or via the next step).
Review comment:
Just noticed that I only ran this on Windows shell, not WSL/bash so this one
might actually be just a different in the params of `git` on Windows.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
[GitHub] janpio commented on a change in pull request #170: CB-13828: Improve cordova-coho/docs
janpio commented on a change in pull request #170: CB-13828: Improve
cordova-coho/docs
URL: https://github.com/apache/cordova-coho/pull/170#discussion_r170091703
##
File path: docs/platforms-release-process.md
##
@@ -86,30 +157,46 @@ Ensure all dependencies and subdependencies have
Apache-compatible licenses.
coho check-license -r android
## Prepare Release
-Increase the version within package.json using SemVer, and remove the `-dev`
suffix.
+
+### Remove the `-dev` suffix from version
+
+This command removes `-dev` from the `version` entry in `package.json`:
for l in cordova-android; do ( cd $l; v="$(grep '"version"' package.json |
cut -d'"' -f4)"; if [[ $v = *-dev ]]; then v2="${v%-dev}"; echo "$l: Setting
version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json;
fi) ; done
-In `cordova-android`, also remember to bump the version in
`framework/build.gradle`.
+Note: This command [doesn't actually
work](https://issues.apache.org/jira/browse/CB-13809). You can also replace
`-dev` manually of course.
Review comment:
Yeah, I also felt this was strange as I assumes these were used quite often.
You can take a look at the linked issues.
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
[GitHub] janpio commented on a change in pull request #170: CB-13828: Improve cordova-coho/docs
janpio commented on a change in pull request #170: CB-13828: Improve cordova-coho/docs URL: https://github.com/apache/cordova-coho/pull/170#discussion_r170091489 ## File path: docs/platforms-release-process.md ## @@ -118,114 +205,147 @@ If you have prepared the release notes in your release branch for a patch releas For iOS, you may have to cherry-pick the commit for `Added X.Y.Z to CDVAvailability.h (via coho)` into the master branch as well. +### Special Case 2: releasing new commits from an already-existing release branch If you are releasing new commits from an already-existing release branch, remember to merge in or cherry-pick relevant commits from master into the release branch! -After, prepare your release branch by using `coho prepare-release-branch` command, which handles the following steps: - * Updating `cordova.js` snapshot - * Creating a release branch (if it doesn't already exist) - * Updating version numbers (`VERSION` file & package.json). On `master`, it gives version a minor bump and adds `-dev` +### Create Release Branch + +Create and prepare your release branch by using `coho prepare-release-branch` command, which handles the following steps: +1. Creates a release branch `5.0.x` (if it doesn't already exist) +2. Updates `cordova.js` snapshot on both `5.0.x` and `master` +3. Updates version numbers (`VERSION` files) on `5.0.x` Review comment: Reworded that and added your example. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
[GitHub] janpio commented on a change in pull request #170: CB-13828: Improve cordova-coho/docs
janpio commented on a change in pull request #170: CB-13828: Improve
cordova-coho/docs
URL: https://github.com/apache/cordova-coho/pull/170#discussion_r170090965
##
File path: docs/platforms-release-process.md
##
@@ -86,30 +157,46 @@ Ensure all dependencies and subdependencies have
Apache-compatible licenses.
coho check-license -r android
## Prepare Release
-Increase the version within package.json using SemVer, and remove the `-dev`
suffix.
+
+### Remove the `-dev` suffix from version
+
+This command removes `-dev` from the `version` entry in `package.json`:
for l in cordova-android; do ( cd $l; v="$(grep '"version"' package.json |
cut -d'"' -f4)"; if [[ $v = *-dev ]]; then v2="${v%-dev}"; echo "$l: Setting
version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json;
fi) ; done
-In `cordova-android`, also remember to bump the version in
`framework/build.gradle`.
+Note: This command [doesn't actually
work](https://issues.apache.org/jira/browse/CB-13809). You can also replace
`-dev` manually of course.
-If the changes merit it, manually bump the major / minor/ patch version in
`package.json`. View the changes via:
+Note: In `cordova-android`, also remember to handle the version in
`framework/build.gradle`.
Review comment:
Is this good enough? I was somehow thinking there was a reason that "remove
-dev" and the other version stuff later is split in 2 parts?
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
