You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/03/11 00:34:04 UTC
cordova-coho git commit: updated app-hello-world release steps
Repository: cordova-coho
Updated Branches:
refs/heads/master 1f405a7a3 -> dcaaa3282
updated app-hello-world release steps
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/dcaaa328
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/dcaaa328
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/dcaaa328
Branch: refs/heads/master
Commit: dcaaa32829e18b48d94325057370e68a188bb809
Parents: 1f405a7
Author: Steve Gill <st...@gmail.com>
Authored: Tue Mar 10 16:34:00 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Tue Mar 10 16:34:00 2015 -0700
----------------------------------------------------------------------
docs/app-hello-world-release-process.md | 25 ++++++++++++-------------
src/create-verify-archive.js | 2 +-
2 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/dcaaa328/docs/app-hello-world-release-process.md
----------------------------------------------------------------------
diff --git a/docs/app-hello-world-release-process.md b/docs/app-hello-world-release-process.md
index 6aa2726..4b2b391 100644
--- a/docs/app-hello-world-release-process.md
+++ b/docs/app-hello-world-release-process.md
@@ -73,35 +73,32 @@ Add a comment to the JIRA issue stating what you tested, and what the results we
Increate the version within `package.json` using `SemVer`, and remove teh `-dev` suffix.
- ( cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; if [[ $v = *-dev ]]; then v2="${v%-dev}"; echo "cordova-app-hello-world: Setting version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json; fi)
+ (cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; if [[ $v = *-dev ]]; then v2="${v%-dev}"; echo "cordova-app-hello-world: Setting version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json; fi)
If the changes merit it, manually bump the major / minor version instead of the micro. List the changes via:
- ( cd cordova-app-hello-world; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master)
+ (cd cordova-app-hello-world; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master)
Update Release notes (Grab changes from the previous release until now):
# Add new heading to release notes with version and date
DATE=$(date "+%h %d, %Y")
- ( cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; echo -e "\n### $v ($DATE)" >> RELEASENOTES.md; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master >> RELEASENOTES.md);
+ (cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; echo -e "\n### $v ($DATE)" >> RELEASENOTES.md; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master >> RELEASENOTES.md);
# Then curate:
vim cordova-app-hello-world/RELEASENOTES.md
-
- cd cordova-android && git commit -am "$JIRA updated RELEASENOTES"
-
Commit these changes
- ( cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git commit -am "$JIRA Updated version and RELEASENOTES.md for release $v" )
+ (cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git commit -am "$JIRA Updated version and RELEASENOTES.md for release $v")
## Tag
# Review commits:
- ( cd cordova-app-hello-world; git log -p origin/master..master)
+ (cd cordova-app-hello-world; git log -p origin/master..master)
# Tag
- ( cd $l; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git tag $v )
+ (cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git tag $v )
## Create Release Branches
@@ -111,18 +108,20 @@ Note: if you are only bumping the patch version (3rd number), use existing branc
## Re-introduce -dev suffix to versions on master
- ( cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; if [[ $v != *-dev ]]; then v2="$(echo $v|awk -F"." '{$NF+=1}{print $0RT}' OFS="." ORS="")-dev"; echo "cordova-app-hello-world: Setting version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json; fi); done
- (cd cordova-app-hello-world; git commit -am "$JIRA Incremented package version to -dev"; git show )
+ (cd cordova-app-hello-world; v="$(grep '"version"' package.json | cut -d'"' -f4)"; if [[ $v != *-dev ]]; then v2="$(echo $v|awk -F"." '{$NF+=1}{print $0RT}' OFS="." ORS="")-dev"; echo "cordova-app-hello-world: Setting version to $v2"; sed -i '' -E 's/version":.*/version": "'$v2'",/' package.json; fi)
+ (cd cordova-app-hello-world; git commit -am "$JIRA Incremented package version to -dev"; git show)
## Push
- ( cd cordova-app-hello-world; git push && git push --tags )
+ (cd cordova-app-hello-world; git push && git push --tags)
If the push fails due to not being fully up-to-date, either:
1. Pull in new changes via `git pull --rebase`, and include them in the release notes / re-tag
2. Pull in new changes via `git pull`, and do *not* include them in the release.
-If you created new release branches, push them as well e.g: `git push origin 3.8.x`
+If you created new release branches, push them as well
+
+ (cd cordova-app-hello-world; git push origin 3.8.x)
## Publish to dist/dev
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/dcaaa328/src/create-verify-archive.js
----------------------------------------------------------------------
diff --git a/src/create-verify-archive.js b/src/create-verify-archive.js
index cd63060..5406a43 100644
--- a/src/create-verify-archive.js
+++ b/src/create-verify-archive.js
@@ -82,7 +82,7 @@ exports.createCommand = function*(argv) {
yield gitutil.gitCheckout(tag);
print('Creating archive of ' + repo.repoName + '@' + tag);
- if (!(repo.id==='mobile-spec' || repo.id==='app-hello-world' || repo.id.indexOf('plugin-')==0)) {
+ if (!(repo.id==='mobile-spec' || repo.id.indexOf('plugin-')==0)) {
if (!argv['allow-pending'] && (yield gitutil.pendingChangesExist())) {
apputil.fatal('Aborting because pending changes exist in ' + repo.repoName);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org