Skip to content

Commit 92d9c5a

Browse files
authoredJul 16, 2018
Add Node 10 to CI config and remove Node 6 (facebook#4383)
* Add Node 10 to Travis config. Remove Node 6. * Add Node 10 to Appveyor config. Remove Node 6. * Remove node 9 from travis config. * Increase mocha timeout. * Update minimum Node version to 8. * Update yarn to latest on Travis. * Update old-node test to use Node 4. * Increase mocha timeout in kitchensink-eject tests. * Update yarn to latest on Appveyor.
1 parent 366e5d3 commit 92d9c5a

File tree

6 files changed

+28
-25
lines changed

6 files changed

+28
-25
lines changed
 

‎.travis.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,23 @@ dist: trusty
33
language: node_js
44
node_js:
55
- 8
6-
- 9
6+
- 10
77
cache:
88
directories:
99
- node_modules
1010
- packages/create-react-app/node_modules
1111
- packages/react-scripts/node_modules
12+
before_install:
13+
- curl -o- -L https://yarnpkg.com/install.sh | bash
14+
- export PATH="$HOME/.yarn/bin:$PATH"
1215
install: true
1316
script:
1417
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
1518
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
1619
- 'if [ $TEST_SUITE = "kitchensink" ]; then tasks/e2e-kitchensink.sh; fi'
1720
- 'if [ $TEST_SUITE = "kitchensink-eject" ]; then tasks/e2e-kitchensink-eject.sh; fi'
18-
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
1921
- 'if [ $TEST_SUITE = "monorepos" ]; then tasks/e2e-monorepos.sh; fi'
22+
- 'if [ $TEST_SUITE = "old-node" ]; then tasks/e2e-old-node.sh; fi'
2023
env:
2124
matrix:
2225
- TEST_SUITE=simple
@@ -26,9 +29,5 @@ env:
2629
- TEST_SUITE=monorepos
2730
matrix:
2831
include:
29-
- node_js: 0.10
32+
- node_js: 4
3033
env: TEST_SUITE=old-node
31-
- node_js: 6
32-
env: TEST_SUITE=kitchensink
33-
- node_js: 6
34-
env: TEST_SUITE=kitchensink-eject

‎appveyor.yml

+14-10
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@ image: Visual Studio 2017
22

33
environment:
44
matrix:
5-
- nodejs_version: 8
5+
- nodejs_version: 10
66
test_suite: "simple"
7-
- nodejs_version: 8
7+
- nodejs_version: 10
88
test_suite: "installs"
9-
- nodejs_version: 8
9+
- nodejs_version: 10
1010
test_suite: "kitchensink"
11-
- nodejs_version: 8
11+
- nodejs_version: 10
1212
test_suite: "kitchensink-eject"
13-
- nodejs_version: 8
13+
- nodejs_version: 10
1414
test_suite: "monorepos"
15-
- nodejs_version: 6
15+
- nodejs_version: 8
1616
test_suite: "simple"
17-
- nodejs_version: 6
17+
- nodejs_version: 8
1818
test_suite: "installs"
19-
- nodejs_version: 6
19+
- nodejs_version: 8
2020
test_suite: "kitchensink"
21-
- nodejs_version: 6
21+
- nodejs_version: 8
2222
test_suite: "kitchensink-eject"
23-
- nodejs_version: 6
23+
- nodejs_version: 8
2424
test_suite: "monorepos"
2525
cache:
2626
- node_modules -> appveyor.cleanup-cache.txt
@@ -36,6 +36,9 @@ platform:
3636

3737
install:
3838
- ps: Install-Product node $env:nodejs_version $env:platform
39+
- ps: |
40+
(New-Object Net.WebClient).DownloadFile("https://yarnpkg.com/latest.msi", "$env:temp\yarn.msi")
41+
cmd /c start /wait msiexec.exe /i $env:temp\yarn.msi /quiet /qn /norestart
3942
4043
build: off
4144

@@ -46,4 +49,5 @@ skip_commits:
4649
test_script:
4750
- node --version
4851
- npm --version
52+
- yarn --version
4953
- bash tasks/e2e-%test_suite%.sh

‎packages/create-react-app/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ var currentNodeVersion = process.versions.node;
4242
var semver = currentNodeVersion.split('.');
4343
var major = semver[0];
4444

45-
if (major < 4) {
45+
if (major < 8) {
4646
console.error(
4747
chalk.red(
4848
'You are running Node ' +
4949
currentNodeVersion +
5050
'.\n' +
51-
'Create React App requires Node 4 or higher. \n' +
51+
'Create React App requires Node 8 or higher. \n' +
5252
'Please update your version of Node.'
5353
)
5454
);

‎tasks/e2e-kitchensink-eject.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ E2E_URL="http://localhost:3002" \
159159
CI=true NODE_PATH=src \
160160
NODE_ENV=development \
161161
BABEL_ENV=test \
162-
node_modules/.bin/mocha --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
162+
node_modules/.bin/mocha --timeout 30000 --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
163163

164164
# Test "production" environment
165165
E2E_FILE=./build/index.html \
@@ -168,7 +168,7 @@ E2E_FILE=./build/index.html \
168168
BABEL_ENV=test \
169169
NODE_PATH=src \
170170
PUBLIC_URL=http://www.example.org/spa/ \
171-
node_modules/.bin/mocha --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
171+
node_modules/.bin/mocha --timeout 30000 --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
172172

173173
# Cleanup
174174
cleanup

‎tasks/e2e-kitchensink.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,15 @@ E2E_URL="http://localhost:3001" \
151151
CI=true NODE_PATH=src \
152152
NODE_ENV=development \
153153
BABEL_ENV=test \
154-
node_modules/.bin/mocha --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
154+
node_modules/.bin/mocha --timeout 30000 --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
155155
# Test "production" environment
156156
E2E_FILE=./build/index.html \
157157
CI=true \
158158
NODE_PATH=src \
159159
NODE_ENV=production \
160160
BABEL_ENV=test \
161161
PUBLIC_URL=http://www.example.org/spa/ \
162-
node_modules/.bin/mocha --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
162+
node_modules/.bin/mocha --timeout 30000 --compilers js:@babel/register --require @babel/polyfill integration/*.test.js
163163

164164
# Cleanup
165165
cleanup

‎tasks/local-test.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function print_help {
88
echo "Usage: ${0} [OPTIONS]"
99
echo ""
1010
echo "OPTIONS:"
11-
echo " --node-version <version> the node version to use while testing [6]"
11+
echo " --node-version <version> the node version to use while testing [8]"
1212
echo " --git-branch <branch> the git branch to checkout for testing [the current one]"
1313
echo " --test-suite <suite> which test suite to use ('simple', installs', 'kitchensink', 'all') ['all']"
1414
echo " --interactive gain a bash shell after the test run"
@@ -18,7 +18,7 @@ function print_help {
1818

1919
cd $(dirname $0)
2020

21-
node_version=6
21+
node_version=8
2222
current_git_branch=`git rev-parse --abbrev-ref HEAD`
2323
git_branch=${current_git_branch}
2424
test_suite=all

0 commit comments

Comments
 (0)