From 1d470242260b4e0cabda8170ec6b42db47352382 Mon Sep 17 00:00:00 2001 From: Tobias Bieniek Date: Thu, 11 Oct 2018 16:05:21 +0200 Subject: [PATCH] CI: Use `yarn` instead of `npm` --- .travis.yml | 14 +++++++------- config/ember-try.js | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c275ec9..8067ee93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,14 +11,14 @@ branches: - /^dependabot\/.*$/ cache: - directories: - - $HOME/.npm + yarn: true before_install: - - npm config set spin false + - curl -o- -L https://yarnpkg.com/install.sh | bash + - export PATH=$HOME/.yarn/bin:$PATH install: - - npm install + - yarn install --no-lockfile jobs: include: @@ -32,7 +32,7 @@ jobs: script: # Usually, it's ok to finish the test scenario without reverting # to the addon's original dependency state, skipping "cleanup". - - npm run test:all -- --skip-cleanup + - yarn test:all --skip-cleanup - <<: *ember-test env: TEST_SUITE=test:keep # used only to make Travis UI show description @@ -41,14 +41,14 @@ jobs: env: NAME=lint # used only to make Travis UI show description script: - - npm run lint + - yarn lint - &node-test stage: test env: NAME=node-tests # used only to make Travis UI show description script: - - npm run test:node + - yarn test:node - <<: *node-test node_js: 8 diff --git a/config/ember-try.js b/config/ember-try.js index 1c782d30..2835054d 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -11,7 +11,8 @@ module.exports = function() { getChannelURL('canary'), ]).then((urls) => { return { - command: process.env.TEST_SUITE ? `npm ${process.env.TEST_SUITE}` : 'npm test', + useYarn: true, + command: process.env.TEST_SUITE ? `yarn ${process.env.TEST_SUITE}` : 'yarn test', useVersionCompatibility: true, scenarios: [ {