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 2016/05/13 06:48:05 UTC
[1/2] cordova-coho git commit: Added common,
fetch and serve to tools release process
Repository: cordova-coho
Updated Branches:
refs/heads/master 028b3642e -> 9e1764277
Added common, fetch and serve to tools release process
This closes #119
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/eac985a2
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/eac985a2
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/eac985a2
Branch: refs/heads/master
Commit: eac985a27b5319cfc7d3684b3e648b6b8062e696
Parents: 028b364
Author: Steve Gill <st...@gmail.com>
Authored: Thu May 12 23:43:04 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Thu May 12 23:46:22 2016 -0700
----------------------------------------------------------------------
docs/tools-release-process.md | 93 ++++++++++++++++++++++++++++++--------
1 file changed, 73 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/eac985a2/docs/tools-release-process.md
----------------------------------------------------------------------
diff --git a/docs/tools-release-process.md b/docs/tools-release-process.md
index 2650d32..2901c45 100644
--- a/docs/tools-release-process.md
+++ b/docs/tools-release-process.md
@@ -19,7 +19,7 @@
#
-->
-# Release Process for ''Plugman, CLI, Cordova-lib, and Cordova-js''
+# Release Process for ''Plugman, CLI, Cordova-lib, Cordova-js, cordova-fetch, cordova-common, cordova-serve''
Before cutting any releases, read the Apache's [Releases Policy](http://www.apache.org/dev/release)
@@ -50,6 +50,9 @@ E.g.:
- cli@
- plugman@
- cordova-js@
+ - common@
+ - fetch@
+ - serve@
## Create JIRA issues
@@ -72,6 +75,9 @@ See if any dependencies are outdated
(cd cordova-js && npm outdated --depth=0)
(cd cordova-lib/cordova-lib && npm outdated --depth=0)
+ (cd cordova-lib/cordova-fetch && npm outdated --depth=0)
+ (cd cordova-lib/cordova-common && npm outdated --depth=0)
+ (cd cordova-lib/cordova-serve && npm outdated --depth=0)
(cd cordova-plugman && npm outdated --depth=0)
(cd cordova-cli && npm outdated --depth=0)
@@ -83,9 +89,10 @@ Update them in each project's `package.json` file. Make sure to run through the
Increase the version within package.json using SemVer, and remove the `-dev` suffix
- for l in cordova-lib/cordova-lib cordova-plugman cordova-cli cordova-js; 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 cordova-js cordova-lib/cordova-common cordova-lib/cordova-fetch cordova-lib/cordova-serve; 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. View the changes via:
+If the changes merit it, manually bump the major / minor version instead of the micro. View the changes via:
+(TODO: need to use coho to get tags for cordova-lib, fetch, common and serve. Current output is incorrect)
( cd cordova-lib/cordova-lib; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master )
@@ -94,35 +101,60 @@ If the changes merit it, manually bump the major / minor version instead of the
( cd cordova-cli; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master)
( cd cordova-js; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master)
+
+ ( cd cordova-lib/cordova-common; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master )
+
+ ( cd cordova-lib/cordova-fetch; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master )
+
+ ( cd cordova-lib/cordova-serve; git log --pretty=format:'* %s' --topo-order --no-merges $(git describe --tags --abbrev=0)..master )
Update each repo's RELEASENOTES.md file with changes
- coho update-release-notes -r cordova-lib -r cordova-js -r cordova-plugman -r cordova-cli
+ coho update-release-notes -r cordova-lib -r cordova-js -r cordova-plugman -r cordova-cli -r common -r fetch -r serve
# Then curate:
- vim cordova-lib/cordova-lib/RELEASENOTES.md cordova-cli/RELEASENOTES.md cordova-plugman/RELEASENOTES.md cordova-js/RELEASENOTES.md
+ vim cordova-lib/cordova-lib/RELEASENOTES.md cordova-cli/RELEASENOTES.md cordova-plugman/RELEASENOTES.md cordova-js/RELEASENOTES.md cordova-lib/cordova-common/RELEASENOTES.md cordova-lib/cordova-fetch/RELEASENOTES.md cordova-lib/cordova-serve/RELEASENOTES.md
Update the version of cordova-lib that cli and plugman depend on:
v="$(grep '"version"' cordova-lib/cordova-lib/package.json | cut -d'"' -f4)"
sed -i '' -E 's/"cordova-lib":.*/"cordova-lib": "'$v'",/' cordova-cli/package.json
- sed -i '' -E 's/"cordova.lib":.*/"cordova-lib": "'$v'",/' cordova-plugman/package.json
+ sed -i '' -E 's/"cordova-lib":.*/"cordova-lib": "'$v'",/' cordova-plugman/package.json
+
+Update the version of cordova-common that cordova-lib, cli and fetch depend on:
+
+ v="$(grep '"version"' cordova-lib/cordova-common/package.json | cut -d'"' -f4)"
+ sed -i '' -E 's/"cordova-common":.*/"cordova-common": "'$v'",/' cordova-cli/package.json
+ sed -i '' -E 's/"cordova-common":.*/"cordova-common": "'$v'",/' cordova-plugman/package.json
+ sed -i '' -E 's/"cordova-common":.*/"cordova-common": "'$v'",/' cordova-lib/cordova-lib/package.json
+ sed -i '' -E 's/"cordova-common":.*/"cordova-common": "'$v'",/' cordova-lib/cordova-fetch/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
+
+Update the version of cordova-fetch that cordova-lib depends on:
+
+ v="$(grep '"version"' cordova-lib/cordova-fetch/package.json | cut -d'"' -f4)"
+ sed -i '' -E 's/"cordova-fetch":.*/"cordova-fetch": "'$v'",/' cordova-lib/cordova-lib/package.json
Commit these changes together into one commit
- for l in cordova-plugman cordova-cli cordova-js cordova-lib/cordova-lib; 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-plugman cordova-cli cordova-js; do ( cd $l; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git commit -am "$JIRA Updated version and RELEASENOTES.md for release $v" ); done
+ (cd cordova-lib/cordova-lib && && v="$(grep '"version"' package.json | cut -d'"' -f4)" && git add package.json RELEASENOTES.md && git commit -m "$JIRA Updated version and RELEASENOTES.md for release $v" )
+ (cd cordova-lib/cordova-common && v="$(grep '"version"' package.json | cut -d'"' -f4)" && git add package.json RELEASENOTES.md && git commit -m "$JIRA Updated version and RELEASENOTES.md for release $v" )
+ (cd cordova-lib/cordova-fetch && && v="$(grep '"version"' package.json | cut -d'"' -f4)" && git add package.json RELEASENOTES.md && git commit -m "$JIRA Updated version and RELEASENOTES.md for release $v" )
+ (cd cordova-lib/cordova-serve && && v="$(grep '"version"' package.json | cut -d'"' -f4)" && git add package.json RELEASENOTES.md && git commit -m "$JIRA Updated version and RELEASENOTES.md for release $v" )
## Test
Link repos:
(cd cordova-js && rm -r node_modules && npm install && npm link)
- (cd cordova-lib/cordova-lib && rm -r node_modules && npm link cordova-js && npm install && npm link)
+ (cd cordova-lib/cordova-common && rm -r node_modules && npm install && npm link)
+ (cd cordova-lib/cordova-fetch && rm -r node_modules && npm link cordova-common && npm install && npm link)
+ (cd cordova-lib/cordova-lib && rm -r node_modules && npm link cordova-js && npm link cordova-common && npm link cordova-fetch && npm install && npm link)
(cd cordova-plugman && rm -r node_modules && npm link cordova-lib && npm install)
- (cd cordova-cli && rm -r node_modules && npm link cordova-lib && npm install)
+ (cd cordova-cli && rm -r node_modules && npm link cordova-lib && npm link cordova-common && npm install)
Ensure license headers are present everywhere. For reference, see this [background](http://www.apache.org/legal/src-headers.html). Expect some noise in the output, for example some files from test fixtures will show up.
@@ -130,6 +162,9 @@ Ensure license headers are present everywhere. For reference, see this [backgrou
coho audit-license-headers -r cli | less
coho audit-license-headers -r plugman | less
coho audit-license-headers -r lib | less
+ coho audit-license-headers -r common | less
+ coho audit-license-headers -r fetch | less
+ coho audit-license-headers -r serve | less
Ensure all dependencies and subdependencies have Apache-compatible licenses
@@ -151,13 +186,15 @@ Ensure uninstall doesn't cause errors:
Ensure that mobilespec creates okay via plugman (you may need to manually uninstall previous mobile-spec app):
cordova-mobile-spec/createmobilespec/createmobilespec.js --plugman --android
- (cd mobilespec-android && platforms/android/cordova/run)
+ (cd mobilespec-android && ./cordova/run)
Ensure unit tests pass (plugman tests are included in lib):
(cd cordova-lib/cordova-lib; npm test)
(cd cordova-cli; npm test)
(cd cordova-js; grunt test --platformVersion=4.0.0)
+ (cd cordova-lib/cordova-fetch; npm test)
+ (cd cordova-lib/cordova-common; npm test)
Add a comment to the JIRA issue stating what you tested, and what the results were.
@@ -168,23 +205,33 @@ Add a comment to the JIRA issue stating what you tested, and what the results we
for l in cordova-plugman cordova-cli cordova-lib cordova-js; do ( cd $l; git log -p origin/master..master ); done
# 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
+ (cd cordova-lib/cordova-fetch; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git tag fetch-$v)
+ (cd cordova-lib/cordova-common; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git tag common-$v)
+ (cd cordova-lib/cordova-serve; v="$(grep '"version"' package.json | cut -d'"' -f4)"; git tag serve-$v)
## Create release branches if they don't yet exist
If branches don't exist, create new ones
- (cd cordova-cli; git branch 5.4.x)
- (cd cordova-lib; git branch 5.4.x)
+ (cd cordova-cli; git branch 6.2.x)
+ (cd cordova-lib; git branch 6.2.x)
(cd cordova-js; git branch 4.1.x)
- (cd cordova-plugman; git branch 1.0.x)
-
+ (cd cordova-plugman; git branch 1.3.x)
+ (cd cordova-lib; git branch fetch-1.0.x)
+ (cd cordova-lib; git branch common-1.3.x)
+ (cd cordova-lib; git branch serve-1.0.x)
+
If branches already exist, update them
(cd cordova-js && git checkout 4.1.x && git merge master && git checkout master)
-## Re-introduce -dev suffix to versions on master
+## Re-introduce -dev suffix to versions on master and commit
- for l in cordova-lib/cordova-lib cordova-plugman cordova-cli cordova-js; 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 cordova-js; 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 cordova-js cordova-lib/cordova-fetch cordova-lib/cordova-common cordova-lib/cordova-serve; 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 cordova-js; do (cd $l; git commit -am "$JIRA Incremented package version to -dev"; git show ); done
+ (cd cordova-lib/cordova-lib && git add package.json && git commit -m "$JIRA Incremented package version to -dev" && git show)
+ (cd cordova-lib/cordova-fetch && git add package.json && git commit -m "$JIRA Incremented package version to -dev" && git show)
+ (cd cordova-lib/cordova-serve && git add package.json && git commit -m "$JIRA Incremented package version to -dev" && git show)
+ (cd cordova-lib/cordova-common && git add package.json && git commit -m "$JIRA Incremented package version to -dev" && git show)
## Push
@@ -203,7 +250,7 @@ Ensure you have the svn repos checked out:
Create archives from your tags:
- coho create-archive -r plugman -r cli -r lib -r js --dest cordova-dist-dev/$JIRA
+ coho create-archive -r plugman -r cli -r lib -r js -r common -r fetch -r serve --dest cordova-dist-dev/$JIRA
Sanity Check:
@@ -238,9 +285,9 @@ __Body:__
The packages were published from their corresponding git tags:
- PASTE OUTPUT OF: coho print-tags -r js -r lib -r plugman -r cli
+ PASTE OUTPUT OF: coho print-tags -r js -r lib -r plugman -r cli -r fetch -r common -r serve
- Upon a successful vote I will upload the archives to dist/, publish them to NPM, and post the corresponding blog post.
+ Upon a successful vote I will upload the archives to dist/, publish them to npm, and post the corresponding blog post.
Voting guidelines: https://github.com/apache/cordova-coho/blob/master/docs/release-voting.md
@@ -286,6 +333,9 @@ _Note: list of PMC members: http://people.apache.org/phonebook.html?pmc=cordova_
svn rm tools/cordova-6*
svn rm tools/plugman-1*
svn rm tools/cordova-js-4*
+ svn rm tools/cordova-fetch-1*
+ svn rm tools/cordova-serve-1*
+ svn rm tools/cordova-common-1*
cp ../cordova-dist-dev/$JIRA/* tools/
svn add tools/*
svn commit -m "$JIRA Published tools release to dist"
@@ -306,6 +356,9 @@ Publish these to npm
npm publish cordova-dist/tools/cordova-lib-6*.tgz
npm publish cordova-dist/tools/cordova-6.*.tgz
npm publish cordova-dist/tools/plugman-1*.tgz
+ npm publish cordova-dist/tools/cordova-fetch-1*.tgz
+ npm publish cordova-dist/tools/cordova-common-1*.tgz
+ npm publish cordova-dist/tools/cordova-serve-1*.tgz
Test from npm:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-coho git commit: added fetch to repoutil
Posted by st...@apache.org.
added fetch to repoutil
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/9e176427
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/9e176427
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/9e176427
Branch: refs/heads/master
Commit: 9e176427720ea07750b32ce6b3b5c1848b67a0f9
Parents: eac985a
Author: Steve Gill <st...@gmail.com>
Authored: Thu May 12 23:47:41 2016 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Thu May 12 23:47:41 2016 -0700
----------------------------------------------------------------------
src/repoutil.js | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/9e176427/src/repoutil.js
----------------------------------------------------------------------
diff --git a/src/repoutil.js b/src/repoutil.js
index 7d1c244..fcf9c14 100644
--- a/src/repoutil.js
+++ b/src/repoutil.js
@@ -334,6 +334,13 @@ var toolRepos = [
versionPrefix: 'common',
isModule: true
}, {
+ title: 'Cordova Fetch',
+ id: 'fetch',
+ repoName: 'cordova-lib',
+ path: 'cordova-fetch',
+ versionPrefix: 'fetch',
+ isModule: true
+ }, {
title: 'Cordova JS',
id: 'js',
repoName: 'cordova-js',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org