Commit 4700d866 authored by yann300's avatar yann300

quick changes

parent 362378ac
...@@ -3,7 +3,7 @@ node_js: ...@@ -3,7 +3,7 @@ node_js:
- stable - stable
script: script:
- npm run lint && npm run test && npm run build - npm run lint && npm run test && npm run build
- bash ci/browser_tests.sh - ./ci/browser_tests.sh
deploy: deploy:
provider: script provider: script
script: ci/deploy_from_travis.sh script: ci/deploy_from_travis.sh
......
#!/bin/bash #!/usr/bin/env bash
SAUCECONNECT_URL="http://saucelabs.com/downloads/sc-4.3.16-linux.tar.gz" SAUCECONNECT_URL="https://saucelabs.com/downloads/sc-4.3.16-linux.tar.gz"
SAUCECONNECT_USERNAME="chriseth" SAUCECONNECT_USERNAME="chriseth"
SAUCECONNECT_ACCESSKEY="b781828a-9e9c-43d8-89d4-2fbb879595ca" SAUCECONNECT_ACCESSKEY="b781828a-9e9c-43d8-89d4-2fbb879595ca"
SAUCECONNECT_JOBIDENTIFIER="browsersolidity_tests_${TRAVIS_JOB_NUMBER}" SAUCECONNECT_JOBIDENTIFIER="browsersolidity_tests_${TRAVIS_JOB_NUMBER}"
...@@ -18,21 +18,10 @@ while [ ! -f $SAUCECONNECT_READYFILE ]; do ...@@ -18,21 +18,10 @@ while [ ! -f $SAUCECONNECT_READYFILE ]; do
sleep .5 sleep .5
done done
function updateTestExitCode() { npm run browser-test-remote-firefox || TEST_EXITCODE=1
if [ $? -eq 1 ] npm run browser-test-remote-chrome || TEST_EXITCODE=1
then npm run browser-test-remote-safari || TEST_EXITCODE=1
TEST_EXITCODE=1 npm run browser-test-remote-ie || TEST_EXITCODE=1
fi
}
npm run browser-test-remote-firefox
updateTestExitCode
npm run browser-test-remote-chrome
updateTestExitCode
npm run browser-test-remote-safari
updateTestExitCode
npm run browser-test-remote-ie
updateTestExitCode
node ci/sauceDisconnect.js $SAUCECONNECT_USERNAME $SAUCECONNECT_ACCESSKEY $SAUCECONNECT_JOBIDENTIFIER node ci/sauceDisconnect.js $SAUCECONNECT_USERNAME $SAUCECONNECT_ACCESSKEY $SAUCECONNECT_JOBIDENTIFIER
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment