diff --git a/.travis.yml b/.travis.yml index b2115580..8067ee93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ --- language: node_js node_js: - - "6" + - "10" sudo: false dist: trusty @@ -10,25 +10,52 @@ branches: except: - /^dependabot\/.*$/ -addons: - chrome: stable - 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 - -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 - - npm run test:node - - npm run lint + - yarn install --no-lockfile + +jobs: + include: + - &ember-test + stage: test + env: TEST_SUITE=test:strip # used only to make Travis UI show description + + addons: + chrome: stable + + script: + # Usually, it's ok to finish the test scenario without reverting + # to the addon's original dependency state, skipping "cleanup". + - yarn test:all --skip-cleanup + + - <<: *ember-test + env: TEST_SUITE=test:keep # used only to make Travis UI show description + + - stage: test + env: NAME=lint # used only to make Travis UI show description + + script: + - yarn lint + + - &node-test + stage: test + env: NAME=node-tests # used only to make Travis UI show description + + script: + - yarn test:node + + - <<: *node-test + node_js: 8 + + - <<: *node-test + node_js: 6 + deploy: provider: npm diff --git a/config/ember-try.js b/config/ember-try.js index 04120381..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: 'npm test', + useYarn: true, + command: process.env.TEST_SUITE ? `yarn ${process.env.TEST_SUITE}` : 'yarn test', useVersionCompatibility: true, scenarios: [ {