Skip to content

Commit

Permalink
Fix AppVeyor CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Timer committed Apr 21, 2017
1 parent 31a38b3 commit 9b75ab4
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
7 changes: 7 additions & 0 deletions tasks/e2e-installs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
# ******************************************************************************
Expand Down
7 changes: 7 additions & 0 deletions tasks/e2e-kitchensink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
# ******************************************************************************
Expand Down
6 changes: 2 additions & 4 deletions tasks/e2e-simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9b75ab4

Please sign in to comment.