Skip to content

Commit

Permalink
Merge pull request desktop#3390 from desktop/install-yarn-the-recomme…
Browse files Browse the repository at this point in the history
…nded-way

yarn docs recommend installing yarn differently
  • Loading branch information
joshaber authored Nov 21, 2017
2 parents 72bbb72 + 0fa2543 commit 2a44043
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ notifications:

dist: trusty

sudo: false

matrix:
include:
- os: linux
Expand All @@ -14,8 +16,6 @@ matrix:
addons:
apt:
packages:
# by default the container VMs have Git 1.9.1, ermagherd...
- git-all
# this is required to compile keytar
- libsecret-1-dev
# this package is essential for testing Electron in a headless fashion
Expand All @@ -40,14 +40,18 @@ node_js:
- "8.9.0"

cache:
yarn: true
timeout: 600
directories:
- node_modules
- $HOME/.electron
- .eslintcache

before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2
- export PATH=$HOME/.yarn/bin:$PATH

install:
- npm install -g yarn@1.3.2
- yarn install --force

script:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ cache:
- .eslintcache
- node_modules
- '%USERPROFILE%\.electron'
- '%LOCALAPPDATA%\Yarn'

branches:
only:
Expand All @@ -23,7 +24,6 @@ version: "{build}"
install:
- cmd: regedit /s script\default-to-tls12-on-appveyor.reg
- ps: Install-Product node $env:nodejs_version $env:platform
- npm install -g yarn@1.3.2
- git submodule update --init --recursive
- yarn install --force

Expand Down
3 changes: 2 additions & 1 deletion circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ dependencies:
- ".eslintcache"
- "node_modules"
- "~/.electron"
- "~/Library/Caches/Yarn/v1"

pre:
- brew update
- brew upgrade node@8
- npm install -g yarn@1.3.2
- brew install yarn

override:
- yarn install --force
Expand Down

0 comments on commit 2a44043

Please sign in to comment.