From 1414f5b3b1d988671b7c5a97ddca2166af38812b Mon Sep 17 00:00:00 2001 From: Aasif Khan Date: Sat, 4 May 2019 18:39:28 +0530 Subject: [PATCH 1/4] Fixes Issue #119 --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d9ba35404..9e710e7a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,11 @@ before_install: - yarn global add greenkeeper-lockfile@2 install: - - yarn --silent + - if [[ $TRAVIS_BRANCH == greenkeeper* ]]; then + yarn install; + else + yarn --silent --pure-lockfile --production=true; + fi before_script: - greenkeeper-lockfile-update From 0825f8d7d219e807297dd731d41fbb270827a3f4 Mon Sep 17 00:00:00 2001 From: Kyle Holmberg Date: Sat, 4 May 2019 09:43:28 -0700 Subject: [PATCH 2/4] Remove extra semi-colons --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9e710e7a9..3d0b0bd79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,10 @@ before_install: - yarn global add greenkeeper-lockfile@2 install: - - if [[ $TRAVIS_BRANCH == greenkeeper* ]]; then - yarn install; + - if [[ $TRAVIS_BRANCH == greenkeeper* ]]; then + yarn --silent else - yarn --silent --pure-lockfile --production=true; + yarn --silent --pure-lockfile --production=true fi before_script: From 14b4474d3dcff438a91d4198f53aa9faae0117c7 Mon Sep 17 00:00:00 2001 From: Kyle Holmberg Date: Sat, 4 May 2019 10:17:15 -0700 Subject: [PATCH 3/4] Re-add semi-colons and remove prod flag --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3d0b0bd79..05b7ffd40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ before_install: install: - if [[ $TRAVIS_BRANCH == greenkeeper* ]]; then - yarn --silent + yarn --silent; else - yarn --silent --pure-lockfile --production=true + yarn --silent --pure-lockfile --production=false; fi before_script: From fe9c93b9fe08dced0ecb09a4dd5677a79c7d6f5e Mon Sep 17 00:00:00 2001 From: Kyle Holmberg Date: Sat, 4 May 2019 10:30:10 -0700 Subject: [PATCH 4/4] Use frozen instead of pure lockfile flag --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05b7ffd40..36cf8bd14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ install: - if [[ $TRAVIS_BRANCH == greenkeeper* ]]; then yarn --silent; else - yarn --silent --pure-lockfile --production=false; + yarn --silent --frozen-lockfile --production=false; fi before_script: