From a5cd55936f39cfef3306463ccd4375fc52617b46 Mon Sep 17 00:00:00 2001 From: Boopathi Rajaa Date: Tue, 7 Nov 2017 22:12:31 +0100 Subject: [PATCH 1/2] Update CI yml files + Upgrade yarn + remove yarn bootstrap (unnecessary) + update circle ci yarn cache --- .travis.yml | 4 ++-- appveyor.yml | 2 +- circle.yml | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb6dd87f9..4ceda80b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,11 @@ node_js: - '4' before_install: -- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.2 +- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.3.2 - export PATH=$HOME/.yarn/bin:$PATH before_script: -- yarn run bootstrap && yarn run build +- yarn build script: - if [ -n "${LINT-}" ]; then yarn run lint ; fi diff --git a/appveyor.yml b/appveyor.yml index fb817026f..cebb9a0d9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ cache: install: - ps: Install-Product node $env:nodejs_version x64 - - npm install -g yarn@1.0.2 + - npm install -g yarn@1.3.2 - set PATH=%APPDATA%\npm;%PATH% - yarn diff --git a/circle.yml b/circle.yml index 22259ab3b..bc344fef9 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: node: version: "node" environment: - PATH: $PATH:./node_modules/.bin + PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" checkout: post: @@ -14,8 +14,10 @@ checkout: dependencies: override: - yarn + cache_directories: + - ~/.cache/yarn post: - - yarn run bootstrap && yarn run build + - yarn build test: override: From b7e40f43ad233e3c4692066eac5065f7afb171c9 Mon Sep 17 00:00:00 2001 From: Boopathi Rajaa Date: Tue, 7 Nov 2017 22:21:12 +0100 Subject: [PATCH 2/2] Add current node_modules/.bin to PATH for circleci --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index bc344fef9..aeb77bc4a 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ machine: node: version: "node" environment: - PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" + PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin:./node_modules/.bin" checkout: post: