Merge branch 'master' into ci-codeship

README.md

@@ -35,6 +35,8 @@ After [enabling Greenkeeper for your repository](https://github.com/integration/
 
 **First [create a GitHub access token with push access to your repository](https://github.com/settings/tokens) and make it available to your CI's environment as `GH_TOKEN`**.
 
+If you use Travis CI, you may add the token using the [CLI app](https://github.com/travis-ci/travis.rb) as follows: `travis encrypt GH_TOKEN=<token> --add` 
+
 Configure your CI to use the npm/yarn version you want your lockfiles to be generated with before it installs your dependencies. Install `greenkeeper-lockfile` as well.
 
 Configure your CI to run `greenkeeper-lockfile-update` right before it executes your tests and `greenkeeper-lockfile-upload` right after it executed your tests.

ci-services/circleci.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const _ = require('lodash')
 
 const env = process.env
@@ -7,5 +9,5 @@ module.exports = {
   branchName: env.CIRCLE_BRANCH,
   firstPush: !env.CIRCLE_PREVIOUS_BUILD_NUM,
   correctBuild: _.isEmpty(env.CI_PULL_REQUEST),
-  uploadBuild: env.CIRCLE_NODE_INDEX === '0'
+  uploadBuild: env.CIRCLE_NODE_INDEX === `${env.BUILD_LEADER_ID || 0}`
 }

ci-services/index.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const _ = require('lodash')
 
 const tests = require('./tests')

ci-services/jenkins.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const env = process.env
 
 const _ = require('lodash')

ci-services/tests.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const env = process.env
 
 module.exports = {

ci-services/travis.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const env = process.env
 
 module.exports = {
@@ -11,5 +13,5 @@ module.exports = {
   // Is this a regular build
   correctBuild: env.TRAVIS_PULL_REQUEST === 'false',
   // Should the lockfile be uploaded from this build
-  uploadBuild: env.TRAVIS_JOB_NUMBER.endsWith('.1')
+  uploadBuild: env.TRAVIS_JOB_NUMBER.endsWith(`.${env.BUILD_LEADER_ID || 1}`)
 }

ci-services/wercker.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const gitHelpers = require('../lib/git-helpers')
 
 const env = process.env

lib/config.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const _ = require('lodash')
 const relative = require('require-relative')
 

lib/extract-dependency.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const _ = require('lodash')
 
 module.exports = function extractDependency (pkg, branchPrefix, branch) {

lib/git-helpers.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const exec = require('child_process').execSync
 
 const _ = require('lodash')