admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #439 from tjarratt/pull_request_travis

Browse Source 
Don't try to use SauceLabs on pull request builds
This commit is contained in:
Gregg Van Hove
2013-10-03 12:32:32 -07:00
parent 255a50baee 520a8c85a2
commit 6354ee17e5
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
travis-core-script.sh
View File

@@ -1,12 +1,14 @@
#!/bin/bash -e #!/bin/bash -e
export DISPLAY=:99.0
/etc/init.d/xvfb start
if [ $USE_SAUCE == true ] if [ $USE_SAUCE == true ]
then then
if [ $TRAVIS_SECURE_ENV_VARS == true ]
then
curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
else
echo "skipping tests since we can't use sauce"
exit 0
fi
fi fi
bundle exec rake jasmine:ci bundle exec rake jasmine:ci