Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/unstable'
Browse files Browse the repository at this point in the history
  • Loading branch information
lilith committed Feb 19, 2015
2 parents d6306d2 + 26ee1ad commit 7ff6dbd
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,12 @@ module.exports = function (grunt) {
testName: title,
browsers: _.values(integration_browsers),
tunnelArgs: ['-v', '--doctor'],
build: process.env.TRAVIS_BUILD_NUMBER || 0,
concurrency: 3, // how many browsers to be run in parallel
sauceConfig: {
'record-video': false,
'video-upload-on-pass': false,
build: process.env.TRAVIS_BUILD_NUMBER || 0,
}
}
}
Expand All @@ -83,7 +85,7 @@ module.exports = function (grunt) {
'http://127.0.0.1:'+port+'/test/index.html'
],
browsers: _.values(unit_browsers),
build: process.env.TRAVIS_JOB_ID,
build: process.env.TRAVIS_BUILD_NUMBER || 0,
pollInterval: 2000, // timeout
maxRetries: 1,
maxPollRetries: 1,
Expand All @@ -94,7 +96,7 @@ module.exports = function (grunt) {
'record-video': false,
tags: [slug, 'unit'],
'video-upload-on-pass': false,
build: process.env.TRAVIS_JOB_ID || 0,
build: process.env.TRAVIS_BUILD_NUMBER || 0,
}
}
}
Expand Down

0 comments on commit 7ff6dbd

Please sign in to comment.