Skip to content

Commit

Permalink
Always use Yarn on CI (#3738)
Browse files Browse the repository at this point in the history
  • Loading branch information
gaearon authored Jan 10, 2018
1 parent a03524c commit dcd8ea6
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 45 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ script:
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
env:
global:
- USE_YARN=no
matrix:
- TEST_SUITE=simple
- TEST_SUITE=installs
Expand All @@ -25,7 +23,3 @@ matrix:
include:
- node_js: 0.10
env: TEST_SUITE=simple
# There's a weird Yarn/Lerna bug related to prerelease versions.
# TODO: reenable after we ship 1.0.
# - node_js: 6
# env: USE_YARN=yes TEST_SUITE=simple
7 changes: 0 additions & 7 deletions tasks/e2e-installs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,6 @@ grep -v "postinstall" package.json > temp && mv temp package.json
npm install
mv package.json.bak package.json

if [ "$USE_YARN" = "yes" ]
then
# Install Yarn so that the test can use it to install packages.
npm install -g yarn
yarn cache clean
fi

# We removed the postinstall, so do it manually
node bootstrap.js

Expand Down
14 changes: 1 addition & 13 deletions tasks/e2e-kitchensink.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,7 @@ function install_package {

# Install `dependencies`
cd node_modules/$pkg/
if [ "$USE_YARN" = "yes" ]
then
yarn install --production
else
npm install --only=production
fi
npm install --only=production
# Remove our packages to ensure side-by-side versions are used (which we link)
rm -rf node_modules/{babel-preset-react-app,eslint-config-react-app,react-dev-utils,react-error-overlay,react-scripts}
cd ../..
Expand Down Expand Up @@ -120,13 +115,6 @@ grep -v "postinstall" package.json > temp && mv temp package.json
npm install
mv package.json.bak package.json

if [ "$USE_YARN" = "yes" ]
then
# Install Yarn so that the test can use it to install packages.
npm install -g yarn
yarn cache clean
fi

# We removed the postinstall, so do it manually
node bootstrap.js

Expand Down
14 changes: 1 addition & 13 deletions tasks/e2e-simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,7 @@ function install_package {

# Install `dependencies`
cd node_modules/$pkg/
if [ "$USE_YARN" = "yes" ]
then
yarn install --production
else
npm install --only=production
fi
npm install --only=production
# Remove our packages to ensure side-by-side versions are used (which we link)
rm -rf node_modules/{babel-preset-react-app,eslint-config-react-app,react-dev-utils,react-error-overlay,react-scripts}
cd ../..
Expand Down Expand Up @@ -147,13 +142,6 @@ then
[[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1
fi

if [ "$USE_YARN" = "yes" ]
then
# Install Yarn so that the test can use it to install packages.
npm install -g yarn
yarn cache clean
fi

# We removed the postinstall, so do it manually here
node bootstrap.js

Expand Down
6 changes: 0 additions & 6 deletions tasks/local-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ function print_help {
echo " --node-version <version> the node version to use while testing [6]"
echo " --git-branch <branch> the git branch to checkout for testing [the current one]"
echo " --test-suite <suite> which test suite to use ('simple', installs', 'kitchensink', 'all') ['all']"
echo " --yarn if present, use yarn as the package manager"
echo " --interactive gain a bash shell after the test run"
echo " --help print this message and exit"
echo ""
Expand All @@ -22,7 +21,6 @@ cd $(dirname $0)
node_version=6
current_git_branch=`git rev-parse --abbrev-ref HEAD`
git_branch=${current_git_branch}
use_yarn=no
test_suite=all
interactive=false

Expand All @@ -36,9 +34,6 @@ while [ "$1" != "" ]; do
shift
git_branch=$1
;;
"--yarn")
use_yarn=yes
;;
"--test-suite")
shift
test_suite=$1
Expand Down Expand Up @@ -107,7 +102,6 @@ CMD
docker run \
--env CI=true \
--env NPM_CONFIG_QUIET=true \
--env USE_YARN=${use_yarn} \
--tty \
--user node \
--volume ${PWD}/..:/var/create-react-app \
Expand Down

0 comments on commit dcd8ea6

Please sign in to comment.