From e8615ac8db70b5b66c27df94cdc6c7f2c711cae6 Mon Sep 17 00:00:00 2001 From: Stefan Dragnev Date: Wed, 9 Jul 2014 09:57:43 +0300 Subject: [PATCH 1/3] integrate with Travis CI --- .travis.yml | 14 ++++++++++++++ Gruntfile.js | 8 +++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..e066559712 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,14 @@ +language: node_js +node_js: + - "0.10" +before_install: + - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules + - git submodule update --init --recursive + - npm install -g grunt-cli +install: + - npm install + - grunt pack --no-color +script: + - exit 0 +git: + submodules: false diff --git a/Gruntfile.js b/Gruntfile.js index e8d50f4a56..b032de5188 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -10,12 +10,14 @@ function shallowCopy(obj) { return result; } +var travis = process.env["TRAVIS"]; + module.exports = function(grunt) { grunt.initConfig({ - copyPackageTo: "\\\\telerik.com\\Resources\\BlackDragon\\Builds\\nativescript-cli", + copyPackageTo: process.env["CopyPackageTo"] || process.env["HOME"] || ".", - jobName: process.env["JOB_NAME"] || "local", - buildNumber: process.env["BUILD_NUMBER"] || "non-ci", + jobName: travis ? "travis" : (process.env["JOB_NAME"] || "local"), + buildNumber: process.env["TRAVIS_BUILD_NUMBER"] || process.env["BUILD_NUMBER"] || "non-ci", dateString: now.substr(0, now.indexOf("T")), pkg: grunt.file.readJSON("package.json"), From 90e3d787167a4d519721aa12545f29941f6a7d55 Mon Sep 17 00:00:00 2001 From: Stefan Dragnev Date: Wed, 9 Jul 2014 10:40:51 +0300 Subject: [PATCH 2/3] readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b9d0b3ce21..a26f4dd930 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ nativescript-cli ================ +[![Build Status](https://travis-ci.org/NativeScript/nativescript-cli.svg?branch=build)](https://travis-ci.org/NativeScript/nativescript-cli) Command-line interface for building NativeScript projects From 4a6a679448e841f9223e0340ba3fe874fc3e65d9 Mon Sep 17 00:00:00 2001 From: Stefan Dragnev Date: Wed, 9 Jul 2014 10:46:03 +0300 Subject: [PATCH 3/3] fix build number --- Gruntfile.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index b032de5188..3647c82c8c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -11,13 +11,14 @@ function shallowCopy(obj) { } var travis = process.env["TRAVIS"]; +var buildNumber = process.env["TRAVIS_BUILD_NUMBER"] || process.env["BUILD_NUMBER"] || "non-ci"; module.exports = function(grunt) { grunt.initConfig({ copyPackageTo: process.env["CopyPackageTo"] || process.env["HOME"] || ".", jobName: travis ? "travis" : (process.env["JOB_NAME"] || "local"), - buildNumber: process.env["TRAVIS_BUILD_NUMBER"] || process.env["BUILD_NUMBER"] || "non-ci", + buildNumber: buildNumber, dateString: now.substr(0, now.indexOf("T")), pkg: grunt.file.readJSON("package.json"), @@ -106,7 +107,7 @@ module.exports = function(grunt) { grunt.registerTask("set_package_version", function(version) { var fs = require("fs"); - var buildVersion = version !== undefined ? version : process.env["BUILD_NUMBER"]; + var buildVersion = version !== undefined ? version : buildNumber; if (process.env["BUILD_CAUSE_GHPRBCAUSE"]) { buildVersion = "PR" + buildVersion; }