diff --git a/.travis.yml b/.travis.yml index 31f8e8edd..3b0327336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,7 @@ branches: - next cache: - directories: - - $HOME/.npm - - $HOME/.yarn-cache + yarn: true matrix: include: @@ -24,7 +22,7 @@ matrix: node_js: "6" env: NO_WATCH_TESTS=1 JOB_PART=test - os: linux - node_js: "4.3" + node_js: "4" env: NO_WATCH_TESTS=1 JOB_PART=test - os: osx node_js: "8" @@ -33,7 +31,7 @@ matrix: - os: osx fast_finish: true -before_script: +install: - bash ./ci/travis-install.sh script: npm run travis:$JOB_PART diff --git a/ci/travis-install.sh b/ci/travis-install.sh index cb62471a2..69ba4da17 100755 --- a/ci/travis-install.sh +++ b/ci/travis-install.sh @@ -1,7 +1,12 @@ #!/bin/bash set -ev -yarn link --frozen-lockfile || true && yarn link webpack --frozen-lockfile; +curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1 + +export PATH=$HOME/.yarn/bin:$PATH + +yarn link --frozen-lockfile || true; yarn --frozen-lockfile +yarn link webpack --frozen-lockfile diff --git a/package.json b/package.json index 851498602..6b9c49444 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "nsp": "nsp check --output summary", "benchmark": "mocha --max-old-space-size=4096 --harmony test/*.benchmark.js -R spec", "cover": "node --max-old-space-size=4096 --harmony ./node_modules/istanbul/lib/cli.js cover -x '**/*.runtime.js' node_modules/mocha/bin/_mocha -- test/*.test.js", - "cover:min": "node --max-old-space-size=4096 --harmony ./node_modules/.bin/istanbul cover -x '**/*.runtime.js' --report lcovonly node_modules/mocha/bin/_mocha -- test/*.test.js", + "cover:min": "node --max-old-space-size=4096 --harmony ./node_modules/istanbul/lib/cli.js cover -x '**/*.runtime.js' --report lcovonly node_modules/mocha/bin/_mocha -- test/*.test.js", "publish-patch": "npm run lint && npm run beautify-lint && mocha && npm version patch && git push && git push --tags && npm publish" } }