Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

chore(yarn): rely on Travis built-in Yarn support, update Yarn in Jenkins #15851

Merged
merged 1 commit into from
Mar 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ node_js:
- '6'

cache:
yarn: true
directories:
- node_modules
- bower_components

branches:
Expand Down Expand Up @@ -35,10 +35,6 @@ addons:
packages:
- g++-4.8

before_install:
- curl -o- -L https://raw.githubusercontent.com/yarnpkg/yarn/2a0afc73210c7a82082585283e518eeb88ca19ae/scripts/install-latest.sh | bash -s -- --version 0.17.9
- export PATH=$HOME/.yarn/bin:$PATH

before_script:
- du -sh ./node_modules ./bower_components/ || true
- ./scripts/travis/before_build.sh
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"engines": {
"node": "^6.9.1",
"yarn": ">=0.17.9",
"yarn": ">=0.21.3",
"grunt": "^1.2.0"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/jenkins/init-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ nvm install

# clean out and install yarn
rm -rf ~/.yarn
curl -o- -L https://raw.githubusercontent.com/yarnpkg/yarn/2a0afc73210c7a82082585283e518eeb88ca19ae/scripts/install-latest.sh | bash -s -- --version 0.17.9
curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.21.3
export PATH="$HOME/.yarn/bin:$PATH"

# Ensure that we have the local dependencies installed
Expand Down