cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject git commit: Add cordova-lib to steps where it was missing
Date Tue, 05 Aug 2014 21:32:31 GMT
Repository: cordova-coho
Updated Branches:
  refs/heads/master 03743c18e -> 73250e0ca


Add cordova-lib to steps where it was missing


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

Branch: refs/heads/master
Commit: 73250e0ca89be61e486d8882b4557bc91fe7fe75
Parents: 03743c1
Author: Marcel Kinard <cmarcelk@gmail.com>
Authored: Tue Aug 5 17:31:58 2014 -0400
Committer: Marcel Kinard <cmarcelk@gmail.com>
Committed: Tue Aug 5 17:31:58 2014 -0400

----------------------------------------------------------------------
 docs/tools-release-process.md | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/73250e0c/docs/tools-release-process.md
----------------------------------------------------------------------
diff --git a/docs/tools-release-process.md b/docs/tools-release-process.md
index 135ebde..af0f013 100644
--- a/docs/tools-release-process.md
+++ b/docs/tools-release-process.md
@@ -89,7 +89,7 @@ Ensure unit tests pass:
 
     (cd cordova-plugman; npm test)
     (cd cordova-cli; npm test)
-    (cd cordova-lib; npm test)
+    (cd cordova-lib/cordova-lib; npm test)
 
 Add a comment to the JIRA issue stating what you tested, and what the results were.
 
@@ -97,10 +97,13 @@ Add a comment to the JIRA issue stating what you tested, and what the
results we
 
 Increase the version within package.json using SemVer, and remove the ''-dev'' suffix
 
-    for l in cordova-plugman cordova-cli; 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
+    for l in cordova-lib/cordova-lib cordova-plugman cordova-cli; 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
 
 If the changes merit it, manually bump the major / minor version instead of the micro. List
the changes via:
 
+    ( cd cordova-lib/cordova-lib; git log --pretty=format:'* %s' --topo-order --no-merges
$(git describe --tags --abbrev=0)..master | grep -v "Incremented plugin version" )
+
+
     ( cd cordova-plugman; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe
--tags --abbrev=0)..master | grep -v "Incremented plugin version" )
 
 
@@ -111,9 +114,9 @@ Update each repo's RELEASENOTES.md file with changes
 
     # Add new heading to release notes with version and date
     DATE=$(date "+%h %d, %Y")
-    for l in cordova-plugman cordova-cli; do ( cd $l; 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 | grep -v "Incremented
plugin version" >> RELEASENOTES.md); done
+    for l in cordova-lib/cordova-lib cordova-plugman cordova-cli; do ( cd $l; 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
| grep -v "Incremented plugin version" >> RELEASENOTES.md); done
     # Then curate:
-    vim cordova-cli/RELEASENOTES.md cordova-plugman/RELEASENOTES.md
+    vim cordova-lib/cordova-lib/RELEASENOTES.md cordova-cli/RELEASENOTES.md cordova-plugman/RELEASENOTES.md
 
 Update the version of cordova-lib that cli and plugman depend on:
 
@@ -123,12 +126,13 @@ Update the version of cordova-lib that cli and plugman depend on:
 
 Create npm-shrinkwrap.json in cli and plugman:
 
+    (cd cordova-lib/cordova-lib; npm shrinkwrap;)
     (cd cordova-cli; npm shrinkwrap;)
     (cd cordova-plugman; npm shrinkwrap;)
 
 Commit these three changes together into one commit
 
-    for l in cordova-plugman cordova-cli; do ( cd $l; v="$(grep '"version"' package.json
| cut -d'"' -f4)"; git commit -am "$JIRA Updated version and RELEASENOTES.md for release $v"
); done
+    for l in cordova-lib/cordova-lib cordova-plugman cordova-cli; do ( cd $l; v="$(grep '"version"'
package.json | cut -d'"' -f4)"; git commit -am "$JIRA Updated version and RELEASENOTES.md
for release $v" ); done
 
 ## Tag
 
@@ -139,17 +143,18 @@ Commit these three changes together into one commit
 
 ## Re-introduce -dev suffix to versions and remove shrinkwrap
 
+    (cd cordova-lib/cordova-lib; git rm npm-shrinkwrap.json;)
     (cd cordova-cli; git rm npm-shrinkwrap.json;)
     (cd cordova-plugman; git rm npm-shrinkwrap.json;)
 
-    for l in cordova-plugman cordova-cli; do ( cd $l; 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 "$l: Setting version to $v2"; sed -i '' -E 's/version":.*/version":
"'$v2'",/' package.json; fi); done
-    for l in cordova-plugman cordova-cli; do (cd $l; git commit -am "$JIRA Incremented package
version to -dev"; git show ); done
+    for l in cordova-lib/cordova-lib cordova-plugman cordova-cli; do ( cd $l; 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 "$l: Setting version to $v2"; sed -i '' -E 's/version":.*/version":
"'$v2'",/' package.json; fi); done
+    for l in cordova-lib/cordova-lib cordova-plugman cordova-cli; do (cd $l; git commit -am
"$JIRA Incremented package version to -dev"; git show ); done
 
 
 ## Push
 
     # Push
-    for l in cordova-plugman cordova-cli; do ( cd $l; git push && git push --tags
); done
+    for l in cordova-lib cordova-plugman cordova-cli; do ( cd $l; git push && git
push --tags ); done
 
 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


Mime
View raw message