From dc925e1ef62385eea8dadae078bdc2280c951ff5 Mon Sep 17 00:00:00 2001 From: Matthew-Gustafson Date: Fri, 21 Apr 2017 22:05:06 -0400 Subject: [PATCH] Fix AppVeyor CI (#2010) --- tasks/e2e-installs.sh | 7 +++++++ tasks/e2e-kitchensink.sh | 7 +++++++ tasks/e2e-simple.sh | 6 ++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tasks/e2e-installs.sh b/tasks/e2e-installs.sh index b8f4016..8970246 100755 --- a/tasks/e2e-installs.sh +++ b/tasks/e2e-installs.sh @@ -83,7 +83,11 @@ set -x cd .. root_path=$PWD +# Prevent lerna bootstrap, we only want top-level dependencies +cp package.json package.json.bak +grep -v "lerna bootstrap" package.json > temp && mv temp package.json npm install +mv package.json.bak package.json if [ "$USE_YARN" = "yes" ] then @@ -92,6 +96,9 @@ then yarn cache clean fi +# We removed the postinstall, so do it manually +./node_modules/.bin/lerna bootstrap --concurrency=1 + # ****************************************************************************** # First, pack and install create-react-app. # ****************************************************************************** diff --git a/tasks/e2e-kitchensink.sh b/tasks/e2e-kitchensink.sh index afc36e1..2c2c1eb 100755 --- a/tasks/e2e-kitchensink.sh +++ b/tasks/e2e-kitchensink.sh @@ -66,7 +66,11 @@ set -x cd .. root_path=$PWD +# Prevent lerna bootstrap, we only want top-level dependencies +cp package.json package.json.bak +grep -v "lerna bootstrap" package.json > temp && mv temp package.json npm install +mv package.json.bak package.json if [ "$USE_YARN" = "yes" ] then @@ -75,6 +79,9 @@ then yarn cache clean fi +# We removed the postinstall, so do it manually +./node_modules/.bin/lerna bootstrap --concurrency=1 + # ****************************************************************************** # First, pack react-scripts and create-react-app so we can use them. # ****************************************************************************** diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index d733656..59cccd8 100755 --- a/tasks/e2e-simple.sh +++ b/tasks/e2e-simple.sh @@ -84,10 +84,8 @@ then [[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1 fi -# Still use npm install instead of directly calling lerna bootstrap to test -# postinstall script functionality (one npm install should result in a working -# project) -npm install +# We removed the postinstall, so do it manually here +./node_modules/.bin/lerna bootstrap --concurrency=1 if [ "$USE_YARN" = "yes" ] then