Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix AppVeyor CI #2010

Merged
merged 1 commit into from
Apr 22, 2017
Merged

Fix AppVeyor CI #2010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions tasks/e2e-installs.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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