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/05/09 03:41:53 UTC
[1/2] cordova-coho git commit: CB-8950 Add NSP to travis
Repository: cordova-coho
Updated Branches:
refs/heads/master a2ac092e3 -> f1a0a825c
CB-8950 Add NSP to travis
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/421e8eda
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/421e8eda
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/421e8eda
Branch: refs/heads/master
Commit: 421e8eda6857b5a9c0f4297c5bbfe0cd418c2d96
Parents: bc4e8d5
Author: Murat Sutunc <su...@gmail.com>
Authored: Mon May 4 10:22:22 2015 -0700
Committer: Murat Sutunc <su...@gmail.com>
Committed: Mon May 4 10:37:58 2015 -0700
----------------------------------------------------------------------
.travis.yml | 5 +++++
README.md | 2 ++
package.json | 6 ++++++
3 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/421e8eda/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..93f8fcf
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: node_js
+sudo: false
+install: npm install
+script:
+ - npm test
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/421e8eda/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 93f09c0..2579ae0 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,8 @@
#
-->
+[![Build Status](https://travis-ci.org/apache/cordova-coho.svg?branch=master)](https://travis-ci.org/apache/cordova-coho)
+
# COHO
This repository has the following purposes:
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/421e8eda/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 7b104ac..59ead14 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,12 @@
"shelljs": "0.1.4",
"treeify": "1.0.1"
},
+ "devDependencies": {
+ "nsp": "*"
+ },
+ "scripts": {
+ "test": "nsp audit-package"
+ },
"repository": {
"type": "git",
"url": "https://git-wip-us.apache.org/repos/asf/cordova-coho.git"
---------------------------------------------------------------------
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: finish merge
Posted by st...@apache.org.
finish merge
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/f1a0a825
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/f1a0a825
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/f1a0a825
Branch: refs/heads/master
Commit: f1a0a825cb3eb44f81b293ffe8c7472092a41115
Parents: a2ac092 421e8ed
Author: Steve Gill <st...@gmail.com>
Authored: Fri May 8 18:41:41 2015 -0700
Committer: Steve Gill <st...@gmail.com>
Committed: Fri May 8 18:41:41 2015 -0700
----------------------------------------------------------------------
.travis.yml | 5 +++++
README.md | 2 ++
package.json | 6 ++++++
src/platform-release.js | 5 ++++-
4 files changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/f1a0a825/src/platform-release.js
----------------------------------------------------------------------
diff --cc src/platform-release.js
index 6842147,6842147..becd1f5
--- a/src/platform-release.js
+++ b/src/platform-release.js
@@@ -132,7 -132,7 +132,10 @@@ function *updateRepoVersion(repo, versi
} else if (repo.id == 'ubuntu') {
shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin', 'build', 'version'));
} else if (repo.id == 'windows') {
-- shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('template', 'cordova', 'version'));
++ if(fs.existsSync(path.join('template', 'cordova', 'version'))) {
++ console.log('version exists');
++ shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('template', 'cordova', 'version'));
++ }
}
shelljs.config.fatal = false;
if (!(yield gitutil.pendingChangesExist())) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org