-
Notifications
You must be signed in to change notification settings - Fork 27.4k
Commit
This should not affect the Jenkins build at all. Now, the Travis build uses Chrome on Sauce Labs, which in theory gives us opportunity to use any browser/platform that Sauce Labs offers.
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,12 +2,19 @@ language: node_js | |
node_js: | ||
- 0.8 | ||
|
||
env: | ||
global: | ||
- SAUCE_USERNAME=angular-ci | ||
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987 | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
mgol
Member
|
||
- SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready | ||
|
||
before_script: | ||
- export DISPLAY=:99.0 | ||
- sh -e /etc/init.d/xvfb start | ||
- export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` | ||
- ./lib/sauce/sauce_connect_setup.sh | ||
- npm install -g grunt-cli | ||
- grunt package | ||
- grunt webserver > /dev/null & | ||
- ./lib/sauce/sauce_connect_block.sh | ||
|
||
script: | ||
- grunt test --browsers Firefox --reporters=dots | ||
- grunt test --reporters dots --browsers SL_Chrome |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,4 +33,6 @@ module.exports = function(config) { | |
suite: 'Docs' | ||
} | ||
}); | ||
|
||
config.sauceLabs.testName = 'AngularJS: docs'; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,4 +22,6 @@ module.exports = function(config) { | |
suite: 'E2E' | ||
} | ||
}); | ||
|
||
config.sauceLabs.testName = 'AngularJS: e2e'; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,4 +13,6 @@ module.exports = function(config) { | |
suite: 'jqLite' | ||
} | ||
}); | ||
|
||
config.sauceLabs.testName = 'AngularJS: jqLite'; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,4 +13,6 @@ module.exports = function(config) { | |
suite: 'jQuery' | ||
} | ||
}); | ||
|
||
config.sauceLabs.testName = 'AngularJS: jQuery'; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,4 +12,6 @@ module.exports = function(config) { | |
suite: 'modules' | ||
} | ||
}); | ||
|
||
config.sauceLabs.testName = 'AngularJS: modules'; | ||
}; |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
#!/bin/bash | ||
|
||
|
||
# Wait for Connect to be ready before exiting | ||
while [ ! -f $SAUCE_CONNECT_READY_FILE ]; do | ||
sleep .5 | ||
done |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
#!/bin/bash | ||
|
||
set -e | ||
|
||
# Setup and start Sauce Connect for your TravisCI build | ||
# This script requires your .travis.yml to include the following two private env variables: | ||
# SAUCE_USERNAME | ||
# SAUCE_ACCESS_KEY | ||
# Follow the steps at https://saucelabs.com/opensource/travis to set that up. | ||
# | ||
# Curl and run this script as part of your .travis.yml before_script section: | ||
# before_script: | ||
# - curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash | ||
|
||
CONNECT_URL="http://saucelabs.com/downloads/Sauce-Connect-latest.zip" | ||
CONNECT_DIR="/tmp/sauce-connect-$RANDOM" | ||
CONNECT_DOWNLOAD="Sauce_Connect.zip" | ||
CONNECT_LOG="$CONNECT_DIR/log" | ||
|
||
# Get Connect and start it | ||
mkdir -p $CONNECT_DIR | ||
cd $CONNECT_DIR | ||
curl $CONNECT_URL > $CONNECT_DOWNLOAD 2> /dev/null | ||
unzip $CONNECT_DOWNLOAD | ||
rm $CONNECT_DOWNLOAD | ||
|
||
|
||
echo "Starting Sauce Connect in the background" | ||
echo "Logging into $CONNECT_LOG" | ||
java -jar Sauce-Connect.jar --readyfile $SAUCE_CONNECT_READY_FILE \ | ||
--tunnel-identifier $TRAVIS_JOB_NUMBER \ | ||
$SAUCE_USERNAME $SAUCE_ACCESS_KEY > $CONNECT_LOG & |
This access key is not encrypted, that doesn't sound as a good practice... See https://saucelabs.com/opensource/travis#setup-sauce-env
Other projects often use that approach, see e.g.:
Lo-Dash: https://github.com/lodash/lodash/blob/master/.travis.yml#L9
Traceur:
Google Web Tracing Framework: https://github.com/google/tracing-framework/blob/master/.travis.yml#L30
Since the key has been in the open for a long time now, I'd advise to reset it when making this change.