cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fil...@apache.org
Subject cordova-coho git commit: update platform release docs, and dont fail silently if grunt cordova js compile fails.
Date Wed, 03 May 2017 00:04:22 GMT
Repository: cordova-coho
Updated Branches:
  refs/heads/master f6482fd40 -> 212133098


update platform release docs, and dont fail silently if grunt cordova js compile fails.


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

Branch: refs/heads/master
Commit: 2121330985fe768b905382053d6d6163c66cc7b8
Parents: f6482fd
Author: filmaj <maj.fil@gmail.com>
Authored: Tue May 2 17:04:10 2017 -0700
Committer: filmaj <maj.fil@gmail.com>
Committed: Tue May 2 17:04:19 2017 -0700

----------------------------------------------------------------------
 docs/platforms-release-process.md | 20 ++++++++++++++------
 src/platform-release.js           |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/21213309/docs/platforms-release-process.md
----------------------------------------------------------------------
diff --git a/docs/platforms-release-process.md b/docs/platforms-release-process.md
index 6946968..a9815ed 100644
--- a/docs/platforms-release-process.md
+++ b/docs/platforms-release-process.md
@@ -87,6 +87,8 @@ Ensure all dependencies and subdependencies have Apache-compatible licenses
 Increase the version within package.json using SemVer, and remove the `-dev` suffix
 
     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`.
     
 If the changes merit it, manually bump the major / minor/ patch version in `package.json`.
View the changes via:
 
@@ -116,14 +118,17 @@ For iOS, you may have to cherry-pick the commit for `Added X.Y.Z to
CDVAvailabil
 
 ---
 
-Prepare your release branch by using `coho prepare-release-branch` command, which handles
the following steps:
+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`
+
     
-Run the following command (make sure to replace the version below  with what is listed inside
`package.json`)
+Run the following command (make sure to replace the version below with what is listed inside
`package.json`)
 
-    coho prepare-release-branch --version 5.0.0 -r android
+    coho prepare-platform-release-branch --version 5.0.0 -r android
     # Ensure commits look okay on both branches
     coho repo-status -r android -b master -b 5.0.x
 
@@ -150,8 +155,9 @@ To submit a fix:
 1) Run [mobile-spec](http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec.git). Don't
forget to run through the manual tests in addition to the automatic tests.
 
     ```
-    ./cordova-mobile-spec/createmobilespec/createmobilespec.js --android 
+    ./cordova-mobile-spec/createmobilespec/createmobilespec.js --android --forceplugins 
     (cd mobilespec && cordova run android --device)
+    (cd mobilespec && cordova run android --emulator)
     ```
 
 2) Create a hello world app using the cordova CLI
@@ -160,6 +166,7 @@ To submit a fix:
     cordova create ./androidTest org.apache.cordova.test androidTest
     (cd androidTest && cordova platform add ../cordova-android)
     (cd androidTest && cordova run android --device)
+    (cd androidTest && cordova run android --emulator)
     ```
 
 3) Run your platform's `./bin/create` script. Ensure generated project builds & runs
both through an IDE and through the cordova/* scripts
@@ -169,6 +176,7 @@ To submit a fix:
     ./cordova-android/bin/create ./androidTest2 org.apache.cordova.test2 androidTest2
     (cd androidTest2 && ./cordova/build)
     (cd androidTest2 && ./cordova/run --device)
+    (cd androidTest2 && ./cordova/run --emulator)
     ```
 
 4) Test Project Upgrade via CLI:
@@ -226,9 +234,9 @@ Feel free to cleanup the projects you just created
 
 Tag & Push:
 
-    coho tag-release --version 3.5.0 -r android --pretend
+    coho tag-platform-release --version 3.5.0 -r android --pretend
     # Seems okay:
-    coho tag-release --version 3.5.0 -r android
+    coho tag-platform-release --version 3.5.0 -r android
     
 The `coho tag-release` command also tags `cordova-js` with `android-5.0.0` and pushes it.
 

http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/21213309/src/platform-release.js
----------------------------------------------------------------------
diff --git a/src/platform-release.js b/src/platform-release.js
index 9e9df33..123aeb1 100644
--- a/src/platform-release.js
+++ b/src/platform-release.js
@@ -141,7 +141,7 @@ function *updateJsSnapshot(repo, version, commit) {
                     //git fetch and update master for cordovajs
                     yield repoupdate.updateRepos([cordovaJsRepo], ['master'], false);
                     yield gitutil.gitCheckout('master');
-                    yield executil.execHelper(executil.ARGS('grunt compile:' +repo.id + '
--platformVersion='+version));
+                    yield executil.execHelper(executil.ARGS('grunt compile:' +repo.id + '
--platformVersion='+version), false, true);
                     hasBuiltJs = version;
                 });
             });


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message