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 2014/10/02 01:32:40 UTC

git commit: added release branch step to tools

Repository: cordova-coho
Updated Branches:
  refs/heads/master c92a17b48 -> ce2cd9c4e


added release branch step to tools


Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/ce2cd9c4
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/ce2cd9c4
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/ce2cd9c4

Branch: refs/heads/master
Commit: ce2cd9c4eabb6bfac7a51365a639f6bff6072e14
Parents: c92a17b
Author: Steven Gill <st...@gmail.com>
Authored: Wed Oct 1 16:32:34 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Wed Oct 1 16:32:34 2014 -0700

----------------------------------------------------------------------
 docs/tools-release-process.md | 53 +++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/ce2cd9c4/docs/tools-release-process.md
----------------------------------------------------------------------
diff --git a/docs/tools-release-process.md b/docs/tools-release-process.md
index 522913f..f051e1d 100644
--- a/docs/tools-release-process.md
+++ b/docs/tools-release-process.md
@@ -127,7 +127,7 @@ Update the version of cordova-lib that cli and plugman depend on:
     sed -i '' -E 's/"cordova.lib":.*/"cordova-lib": "'$v'",/' cordova-plugman/package.json
     
 Update the version of cordova-js that cordova-lib depends on:
-    
+
     v="$(grep '"version"' cordova-js/package.json | cut -d'"' -f4)"
     sed -i '' -E 's/"cordova-js":.*/"cordova-js": "'$v'",/' cordova-lib/cordova-lib/package.json
 
@@ -190,6 +190,11 @@ Commit these changes together into one commit
     # Tag
     for l in cordova-plugman cordova-cli cordova-lib/cordova-lib cordova-js; do ( cd $l; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git tag $v ); done
 
+## Create release branches
+
+    (cd cordova-cli; git checkout -b 3.7.x master)
+    (cd cordova-lib/cordova-lib; git checkout -b 3.7.x master) 
+
 ## Re-introduce -dev suffix to versions and remove shrinkwrap
 
     (cd cordova-lib/cordova-lib; git rm npm-shrinkwrap.json;)
@@ -228,6 +233,16 @@ Upload:
 
 Find your release here: https://dist.apache.org/repos/dist/dev/cordova/
 
+## Test from NPM
+
+    npm -g uninstall cordova
+    npm -g install cordova@rc
+    cordova create mytest
+    cd mytest
+    cordova platform add android
+    cordova plugin add org.apache.cordova.device
+    cordova build
+
 ## Prepare Blog Post
  * Combine highlights from RELEASENOTES.md into a Release Announcement blog post
    * Instructions on [sites page README](https://svn.apache.org/repos/asf/cordova/site/README.md)
@@ -283,10 +298,12 @@ Respond to the vote thread with:
 _Note: list of PMC members: http://people.apache.org/committers-by-project.html#cordova-pmc_
 
 ## If the Vote does *not* Pass
-* Revert adding of `-dev`
+
+* git checkout release branch if exists
 * Address the concerns
-* Re-tag release using `git tag -f`
-* Add back `-dev`
+* Bump the version number in package.json
+* Create new tag based on new version number
+* Cherry-pick relevant commits to master if applicable
 * Start a new vote
 
 ## Otherwise: Publish to dist/
@@ -307,31 +324,13 @@ _Note: list of PMC members: http://people.apache.org/committers-by-project.html#
 
 Find your release here: https://dist.apache.org/repos/dist/release/cordova/tools
 
-## Publish to NPM
-
-    npm publish --tag cordova-dist/tools/cordova-lib-*.tgz
-    npm publish --tag cordova-dist/tools/cordova-cli-*.tgz
-    npm publish --tag cordova-dist/tools/cordova-plugman-*.tgz
-    npm publish --tag cordova-dist/tools/cordova-js-*.tgz
-
-If npm publish fails for you, run `npm owner ls PACKAGENAME` to see if you are an owner. If you aren't, ask one of the owners to add you.
-
-## Test from NPM
-
-    npm -g uninstall cordova
-    npm -g install cordova@3.6.3-0.2.13
-    cordova create mytest
-    cd mytest
-    cordova platform add android
-    cordova plugin add org.apache.cordova.device
-    cordova build
-
 ## Promote to `latest` in NPM
 
-    npm tag cordova-js@3.6.4 latest
-    npm tag cordova-lib@0.21.13 latest
-    npm tag cordova-plugman@0.22.10 latest
-    npm tag cordova@3.6.3-0.2.13 latest
+    cd cordova-dist/tools
+    npm tag cordova-js*.tgz latest
+    npm tag cordova-lib*.tgz latest
+    npm tag plugman*.tgz latest
+    npm tag cordova-3*.tgz latest
 
 ## Post Blog Post