From a82b53941d8b932782f630113a1432478a6a67ac Mon Sep 17 00:00:00 2001 From: Christian Murphy Date: Tue, 7 Jul 2015 13:36:21 -0700 Subject: [PATCH 1/5] update badge and use container build --- .travis.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cfec1b0..58f4c22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: node_js +sudo: false before_install: - "npm i -g npm@1.4.28" node_js: @@ -9,4 +10,3 @@ notifications: email: - travis@nodejitsu.com irc: "irc.freenode.org#nodejitsu" - diff --git a/README.md b/README.md index aa395d1..47f2c52 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# nconf [![Build Status](https://secure.travis-ci.org/flatiron/nconf.png)](http://travis-ci.org/flatiron/nconf) +# nconf [![Build Status](https://travis-ci.org/indexzero/nconf.svg)](https://travis-ci.org/indexzero/nconf) Hierarchical node.js configuration with files, environment variables, command-line arguments, and atomic object merging. From 32d560c95d416677f1fe1668b50f70d5673a52b3 Mon Sep 17 00:00:00 2001 From: Joseph Page Date: Sat, 4 Jul 2015 17:53:42 +0200 Subject: [PATCH 2/5] Add tests for node 0.12 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cfec1b0..ad68935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ node_js: - 0.8 - 0.10 - 0.11 + - 0.12 notifications: email: - travis@nodejitsu.com From a2b812f7042495091234e010cbce9ae28f6afbbf Mon Sep 17 00:00:00 2001 From: Joseph Page Date: Tue, 7 Jul 2015 12:46:56 +0200 Subject: [PATCH 3/5] Add travis tests for iojs --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ad68935..4112103 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ node_js: - 0.10 - 0.11 - 0.12 + - iojs notifications: email: - travis@nodejitsu.com From abeeca0d5f8b4a4d63ffbecc6fb65f6024c431b0 Mon Sep 17 00:00:00 2001 From: Joseph Page Date: Wed, 19 Aug 2015 17:47:01 +0200 Subject: [PATCH 4/5] [travis] fix npm bugs for node 0.8 (recommended way) --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 281b46a..f111d77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: node_js sudo: false before_install: - - "npm i -g npm@1.4.28" + - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28' + - npm install -g npm@latest node_js: - 0.8 - 0.10 From 7d6be3265b2ea8fc841c14b186efcb77f84f4d97 Mon Sep 17 00:00:00 2001 From: Joseph Page Date: Wed, 19 Aug 2015 17:52:09 +0200 Subject: [PATCH 5/5] [travis] fix yaml syntax (supposed to solve nvm bugs #182) --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f111d77..709a14d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,11 @@ before_install: - '[ "${TRAVIS_NODE_VERSION}" != "0.8" ] || npm install -g npm@1.4.28' - npm install -g npm@latest node_js: - - 0.8 - - 0.10 - - 0.11 - - 0.12 - - iojs + - "0.8" + - "0.10" + - "0.11" + - "0.12" + - "iojs" notifications: email: - travis@nodejitsu.com