Skip to content

Commit

Permalink
CI: Use yarn instead of npm
Browse files Browse the repository at this point in the history
  • Loading branch information
Turbo87 committed Oct 12, 2018
1 parent 75ae392 commit 1d47024
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
{
Expand Down

0 comments on commit 1d47024

Please sign in to comment.