diff --git a/.travis.yml b/.travis.yml index df5eaa2d..5b73d8a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: node_js node_js: - "11" + - "10" + - "8" script: $TEST_COMMAND @@ -19,10 +21,10 @@ matrix: include: - env: - USE_SAUCE=false - - TEST_COMMAND="bash travis-node-script.sh v8" + - TEST_COMMAND="npm test" - env: - USE_SAUCE=false - - TEST_COMMAND="bash travis-node-script.sh v9" + - TEST_COMMAND="npm test" - env: - JASMINE_BROWSER="firefox" - SAUCE_OS="Linux" diff --git a/ci.js b/ci.js index 7e9aed2a..f9058329 100644 --- a/ci.js +++ b/ci.js @@ -197,7 +197,7 @@ async function getResults(driver) { console.log(`Randomized with seed ${details.seed} ( ${host}/?random=${details.random}&seed=${details.seed} )`); if (useSauce) { - driver.executeScript(`sauce:job-result=${exitCode === 0}`); + driver.executeScript(`sauce:job-result=${process.exitCode === 0}`); } })().finally(() => { return Promise.all([driver.close(), new Promise(resolve => server.close(resolve))]); diff --git a/travis-node-script.sh b/travis-node-script.sh deleted file mode 100644 index be7e257c..00000000 --- a/travis-node-script.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -e - -rm -rf ~/.nvm -git clone https://github.com/creationix/nvm.git ~/.nvm -(cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) -source ~/.nvm/nvm.sh -nvm install ${1:-"v0.12.18"} - -if [ "$1" = "v4" ]; then - node -e "pack=require('./package.json');pack.devDependencies['grunt-contrib-jshint']='^1.1.0';require('fs').writeFileSync('./package.json', JSON.stringify(pack, null, 2));" -fi - -npm install - -if [ "$1" = "v8" ] || [ "$1" = "v9" ]; then - npm rebuild node-sass --force -fi - -npm test