diff options
| author | Vojta Jina | 2013-12-11 09:56:06 -0800 |
|---|---|---|
| committer | Vojta Jina | 2013-12-11 10:12:18 -0800 |
| commit | 8864e54f1f94883f3e22d7ce7ed87a699467a217 (patch) | |
| tree | 256453f7e9ac9c8460be80d751af14b62e3f79f7 | |
| parent | dc4df931778a374f1fb3c8af7545733c09b9c098 (diff) | |
| download | angular.js-8864e54f1f94883f3e22d7ce7ed87a699467a217.tar.bz2 | |
chore(scripts): refactor travis scripts
Refactoring so that it's easier to use both SL/BS just depending on a global switch.
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rwxr-xr-x | lib/sauce/sauce_connect_setup.sh | 4 | ||||
| -rwxr-xr-x | scripts/travis/build.sh (renamed from travis_build.sh) | 0 | ||||
| -rwxr-xr-x | scripts/travis/print_logs.sh (renamed from travis_print_logs.sh) | 0 | ||||
| -rwxr-xr-x | scripts/travis/wait_for_browser_provider.sh (renamed from lib/sauce/sauce_connect_block.sh) | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 3fd054aa..bec9ce82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,10 @@ env: global: - SAUCE_USERNAME=angular-ci - SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987 - # rename to BROWSER_PROVIDER_READY_FILE - - SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready - BROWSER_STACK_USERNAME=VojtaJina - BROWSER_STACK_ACCESS_KEY=HAfHZaypxAc3PEUrUU9a - LOGS_DIR=/tmp/angular-build/logs + - BROWSER_PROVIDER_READY_FILE=/tmp/sauce-connect-ready before_script: - mkdir -p $LOGS_DIR @@ -22,10 +21,10 @@ before_script: - grunt bower - grunt bower - grunt package-without-bower - - ./lib/sauce/sauce_connect_block.sh + - ./scripts/travis/wait_for_browser_provider.sh script: - - ./travis_build.sh + - ./scripts/travis/build.sh after_script: - - ./travis_print_logs.sh + - ./scripts/travis/print_logs.sh diff --git a/lib/sauce/sauce_connect_setup.sh b/lib/sauce/sauce_connect_setup.sh index 5e8e138d..c49cff0a 100755 --- a/lib/sauce/sauce_connect_setup.sh +++ b/lib/sauce/sauce_connect_setup.sh @@ -36,8 +36,8 @@ ARGS="" if [ ! -z "$TRAVIS_JOB_NUMBER" ]; then ARGS="$ARGS --tunnel-identifier $TRAVIS_JOB_NUMBER" fi -if [ ! -z "$SAUCE_CONNECT_READY_FILE" ]; then - ARGS="$ARGS --readyfile $SAUCE_CONNECT_READY_FILE" +if [ ! -z "$BROWSER_PROVIDER_READY_FILE" ]; then + ARGS="$ARGS --readyfile $BROWSER_PROVIDER_READY_FILE" fi diff --git a/travis_build.sh b/scripts/travis/build.sh index 6467bc1a..6467bc1a 100755 --- a/travis_build.sh +++ b/scripts/travis/build.sh diff --git a/travis_print_logs.sh b/scripts/travis/print_logs.sh index ec612ca1..ec612ca1 100755 --- a/travis_print_logs.sh +++ b/scripts/travis/print_logs.sh diff --git a/lib/sauce/sauce_connect_block.sh b/scripts/travis/wait_for_browser_provider.sh index 126d3710..1e8157c2 100755 --- a/lib/sauce/sauce_connect_block.sh +++ b/scripts/travis/wait_for_browser_provider.sh @@ -2,6 +2,6 @@ # Wait for Connect to be ready before exiting -while [ ! -f $SAUCE_CONNECT_READY_FILE ]; do +while [ ! -f $BROWSER_PROVIDER_READY_FILE ]; do sleep .5 done |