From 81e6ffaf0258c068b373a7317128ce52e042694a Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 26 Jun 2017 19:36:22 +0100 Subject: [PATCH 1/6] Try to fix AppVeyor CI --- tasks/e2e-simple.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index 163bec0818a..baec351300b 100755 --- a/tasks/e2e-simple.sh +++ b/tasks/e2e-simple.sh @@ -68,22 +68,8 @@ root_path=$PWD # Clear cache to avoid issues with incorrect packages being used if hash yarnpkg 2>/dev/null then - # AppVeyor uses an old version of yarn. - # Once updated to 0.24.3 or above, the workaround can be removed - # and replaced with `yarnpkg cache clean` - # Issues: - # https://github.com/yarnpkg/yarn/issues/2591 - # https://github.com/appveyor/ci/issues/1576 - # https://github.com/facebookincubator/create-react-app/pull/2400 - # When removing workaround, you may run into - # https://github.com/facebookincubator/create-react-app/issues/2030 - case "$(uname -s)" in - *CYGWIN*|MSYS*|MINGW*) yarn=yarn.cmd;; - *) yarn=yarnpkg;; - esac $yarn cache clean fi - if hash npm 2>/dev/null then npm cache clean From 2dd49c818e51c34465544c601a46b5f36fe5e428 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 26 Jun 2017 19:37:18 +0100 Subject: [PATCH 2/6] Same --- tasks/e2e-installs.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh index 8f4789ff0c7..be2565371f0 100755 --- a/tasks/e2e-installs.sh +++ b/tasks/e2e-installs.sh @@ -86,22 +86,8 @@ root_path=$PWD # Clear cache to avoid issues with incorrect packages being used if hash yarnpkg 2>/dev/null then - # AppVeyor uses an old version of yarn. - # Once updated to 0.24.3 or above, the workaround can be removed - # and replaced with `yarnpkg cache clean` - # Issues: - # https://github.com/yarnpkg/yarn/issues/2591 - # https://github.com/appveyor/ci/issues/1576 - # https://github.com/facebookincubator/create-react-app/pull/2400 - # When removing workaround, you may run into - # https://github.com/facebookincubator/create-react-app/issues/2030 - case "$(uname -s)" in - *CYGWIN*|MSYS*|MINGW*) yarn=yarn.cmd;; - *) yarn=yarnpkg;; - esac $yarn cache clean fi - if hash npm 2>/dev/null then npm cache clean From 1730f7357c63250d54f340aad80684ef171889e0 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 26 Jun 2017 19:37:32 +0100 Subject: [PATCH 3/6] Same --- tasks/e2e-kitchensink.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index fcd687e4b0d..06b8abfa2b9 100755 --- a/tasks/e2e-kitchensink.sh +++ b/tasks/e2e-kitchensink.sh @@ -69,22 +69,8 @@ root_path=$PWD # Clear cache to avoid issues with incorrect packages being used if hash yarnpkg 2>/dev/null then - # AppVeyor uses an old version of yarn. - # Once updated to 0.24.3 or above, the workaround can be removed - # and replaced with `yarnpkg cache clean` - # Issues: - # https://github.com/yarnpkg/yarn/issues/2591 - # https://github.com/appveyor/ci/issues/1576 - # https://github.com/facebookincubator/create-react-app/pull/2400 - # When removing workaround, you may run into - # https://github.com/facebookincubator/create-react-app/issues/2030 - case "$(uname -s)" in - *CYGWIN*|MSYS*|MINGW*) yarn=yarn.cmd;; - *) yarn=yarnpkg;; - esac $yarn cache clean fi - if hash npm 2>/dev/null then npm cache clean From 0b3af7e999a4ceb5ec178ee785a5d54fa51bf77c Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 26 Jun 2017 19:43:54 +0100 Subject: [PATCH 4/6] Update e2e-simple.sh --- tasks/e2e-simple.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index baec351300b..ede36eac645 100755 --- a/tasks/e2e-simple.sh +++ b/tasks/e2e-simple.sh @@ -68,7 +68,7 @@ root_path=$PWD # Clear cache to avoid issues with incorrect packages being used if hash yarnpkg 2>/dev/null then - $yarn cache clean + yarnpkg cache clean fi if hash npm 2>/dev/null then From af85df97c3e2d615655b12e63bfb18ba25aa2440 Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 26 Jun 2017 19:44:10 +0100 Subject: [PATCH 5/6] Update e2e-kitchensink.sh --- tasks/e2e-kitchensink.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index 06b8abfa2b9..7f9e705d73e 100755 --- a/tasks/e2e-kitchensink.sh +++ b/tasks/e2e-kitchensink.sh @@ -69,7 +69,7 @@ root_path=$PWD # Clear cache to avoid issues with incorrect packages being used if hash yarnpkg 2>/dev/null then - $yarn cache clean + yarnpkg cache clean fi if hash npm 2>/dev/null then From c8450cc3b6c7b9e16b7059a5a126bad7bfc0c00b Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Mon, 26 Jun 2017 19:44:28 +0100 Subject: [PATCH 6/6] Update e2e-installs.sh --- tasks/e2e-installs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh index be2565371f0..08e8e6291c4 100755 --- a/tasks/e2e-installs.sh +++ b/tasks/e2e-installs.sh @@ -86,7 +86,7 @@ root_path=$PWD # Clear cache to avoid issues with incorrect packages being used if hash yarnpkg 2>/dev/null then - $yarn cache clean + yarnpkg cache clean fi if hash npm 2>/dev/null then