Unverified Commit dcd8ea6b authored by Dan Abramov's avatar Dan Abramov Committed by GitHub
Browse files

Always use Yarn on CI (#3738)

parent a03524c5
Showing with 2 additions and 45 deletions
+2 -45
...@@ -15,8 +15,6 @@ script: ...@@ -15,8 +15,6 @@ script:
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi' - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi' - 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
env: env:
global:
- USE_YARN=no
matrix: matrix:
- TEST_SUITE=simple - TEST_SUITE=simple
- TEST_SUITE=installs - TEST_SUITE=installs
...@@ -25,7 +23,3 @@ matrix: ...@@ -25,7 +23,3 @@ matrix:
include: include:
- node_js: 0.10 - node_js: 0.10
env: TEST_SUITE=simple 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
...@@ -103,13 +103,6 @@ grep -v "postinstall" package.json > temp && mv temp package.json ...@@ -103,13 +103,6 @@ grep -v "postinstall" package.json > temp && mv temp package.json
npm install npm install
mv package.json.bak package.json 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 # We removed the postinstall, so do it manually
node bootstrap.js node bootstrap.js
......
...@@ -58,12 +58,7 @@ function install_package { ...@@ -58,12 +58,7 @@ function install_package {
# Install `dependencies` # Install `dependencies`
cd node_modules/$pkg/ cd node_modules/$pkg/
if [ "$USE_YARN" = "yes" ] npm install --only=production
then
yarn install --production
else
npm install --only=production
fi
# Remove our packages to ensure side-by-side versions are used (which we link) # 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} rm -rf node_modules/{babel-preset-react-app,eslint-config-react-app,react-dev-utils,react-error-overlay,react-scripts}
cd ../.. cd ../..
...@@ -120,13 +115,6 @@ grep -v "postinstall" package.json > temp && mv temp package.json ...@@ -120,13 +115,6 @@ grep -v "postinstall" package.json > temp && mv temp package.json
npm install npm install
mv package.json.bak package.json 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 # We removed the postinstall, so do it manually
node bootstrap.js node bootstrap.js
......
...@@ -57,12 +57,7 @@ function install_package { ...@@ -57,12 +57,7 @@ function install_package {
# Install `dependencies` # Install `dependencies`
cd node_modules/$pkg/ cd node_modules/$pkg/
if [ "$USE_YARN" = "yes" ] npm install --only=production
then
yarn install --production
else
npm install --only=production
fi
# Remove our packages to ensure side-by-side versions are used (which we link) # 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} rm -rf node_modules/{babel-preset-react-app,eslint-config-react-app,react-dev-utils,react-error-overlay,react-scripts}
cd ../.. cd ../..
...@@ -147,13 +142,6 @@ then ...@@ -147,13 +142,6 @@ then
[[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1 [[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1
fi 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 # We removed the postinstall, so do it manually here
node bootstrap.js node bootstrap.js
......
...@@ -11,7 +11,6 @@ function print_help { ...@@ -11,7 +11,6 @@ function print_help {
echo " --node-version <version> the node version to use while testing [6]" 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 " --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 " --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 " --interactive gain a bash shell after the test run"
echo " --help print this message and exit" echo " --help print this message and exit"
echo "" echo ""
...@@ -22,7 +21,6 @@ cd $(dirname $0) ...@@ -22,7 +21,6 @@ cd $(dirname $0)
node_version=6 node_version=6
current_git_branch=`git rev-parse --abbrev-ref HEAD` current_git_branch=`git rev-parse --abbrev-ref HEAD`
git_branch=${current_git_branch} git_branch=${current_git_branch}
use_yarn=no
test_suite=all test_suite=all
interactive=false interactive=false
...@@ -36,9 +34,6 @@ while [ "$1" != "" ]; do ...@@ -36,9 +34,6 @@ while [ "$1" != "" ]; do
shift shift
git_branch=$1 git_branch=$1
;; ;;
"--yarn")
use_yarn=yes
;;
"--test-suite") "--test-suite")
shift shift
test_suite=$1 test_suite=$1
...@@ -107,7 +102,6 @@ CMD ...@@ -107,7 +102,6 @@ CMD
docker run \ docker run \
--env CI=true \ --env CI=true \
--env NPM_CONFIG_QUIET=true \ --env NPM_CONFIG_QUIET=true \
--env USE_YARN=${use_yarn} \
--tty \ --tty \
--user node \ --user node \
--volume ${PWD}/..:/var/create-react-app \ --volume ${PWD}/..:/var/create-react-app \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment