Skip to content

Commit

Permalink
chore(scripts): refactor travis scripts
Browse files Browse the repository at this point in the history
Refactoring so that it's easier to use both SL/BS just depending on a global switch.
  • Loading branch information
vojtajina committed Dec 11, 2013
1 parent dc4df93 commit 8864e54
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
9 changes: 4 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions lib/sauce/sauce_connect_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 8864e54

Please sign in to comment.