diff options
| author | Vojta Jina | 2013-12-03 12:15:36 -0800 |
|---|---|---|
| committer | Vojta Jina | 2013-12-03 15:49:19 -0800 |
| commit | 6127528b5008a507966c7f1a1030db27ca2fbc0b (patch) | |
| tree | 2075f8e578de4329da164c4909e62d87a9fa9f7e | |
| parent | 041057232206e07164ed0aa4ecb9abe0f3fc23f4 (diff) | |
| download | angular.js-6127528b5008a507966c7f1a1030db27ca2fbc0b.tar.bz2 | |
chore(travis): switch back to SauceLabs
I think we are pretty close to be able to use both.
The xhr-polling seems to be pretty stable, but I'm having problems with multiple SSH tunnels (on BS), so let's try to switch back to SL.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | karma-shared.conf.js | 4 | ||||
| -rw-r--r-- | lib/grunt/utils.js | 2 | ||||
| -rwxr-xr-x | travis_build.sh | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 0c31fbe8..b8d925b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: before_script: - mkdir -p $LOGS_DIR - - ./lib/browser-stack/start-tunnel.sh + - ./lib/sauce/sauce_connect_setup.sh - npm install -g grunt-cli - grunt bower - grunt bower diff --git a/karma-shared.conf.js b/karma-shared.conf.js index 854a18d5..76fd1caf 100644 --- a/karma-shared.conf.js +++ b/karma-shared.conf.js @@ -122,6 +122,10 @@ module.exports = function(config, specificOptions) { config.transports = ['websocket', 'xhr-polling']; config.browserStack.build = 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')'; + // TODO(vojta): remove once SauceLabs supports websockets. + // This speeds up the capturing a bit, as browsers don't even try to use websocket. + config.transports = ['xhr-polling']; + // Debug logging into a file, that we print out at the end of the build. config.loggers.push({ type: 'file', diff --git a/lib/grunt/utils.js b/lib/grunt/utils.js index 49d346a0..9e0aab99 100644 --- a/lib/grunt/utils.js +++ b/lib/grunt/utils.js @@ -295,7 +295,7 @@ module.exports = { stream: options && options.stream }; - args.push('--port=' + this.availablePorts.pop()); + args.push('--port=' + this.sauceLabsAvailablePorts.pop()); if (args.indexOf('test:e2e') !== -1 && grunt.option('e2e-browsers')) { args.push('--browsers=' + grunt.option('e2e-browsers')); diff --git a/travis_build.sh b/travis_build.sh index e51db211..04845058 100755 --- a/travis_build.sh +++ b/travis_build.sh @@ -5,5 +5,5 @@ set -e export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` grunt parallel:travis --reporters dots \ - --browsers BS_Chrome,BS_Safari,BS_Firefox,BS_IE_8,BS_IE_9,BS_IE_10,BS_IE_11 \ - --e2e-browsers BS_Chrome + --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 \ + --e2e-browsers SL_Chrome |