Commit 9df3104b authored by Joe Haddad's avatar Joe Haddad Committed by GitHub
Browse files

Revert "Don't run CI on Node 0.10" (#1547)

* Revert "Don't run CI on Node 0.10"

* Install after checking node version

* Don't use travis install
parent ce0d6eeb
4 merge requests!12191Lim.Pisey.168:/Identified - We are currently investigating reports of missing build logs. The issue has been identified and a resolution is in progress. We will provide a further update when available.Mar 21, 09:02 UTC,!12853brikk,!5717Automatically extract project file structure from build bundle file,!1933Add note about installing watchman
Showing with 5 additions and 2 deletions
+5 -2
...@@ -8,6 +8,7 @@ cache: ...@@ -8,6 +8,7 @@ cache:
- node_modules - node_modules
- packages/create-react-app/node_modules - packages/create-react-app/node_modules
- packages/react-scripts/node_modules - packages/react-scripts/node_modules
install: true
script: script:
- 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi' - 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi'
- 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi' - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'
...@@ -21,5 +22,7 @@ env: ...@@ -21,5 +22,7 @@ env:
- TEST_SUITE=kitchensink - TEST_SUITE=kitchensink
matrix: matrix:
include: include:
- node_js: 0.10
env: TEST_SUITE=simple
- node_js: 6 - node_js: 6
env: USE_YARN=yes TEST_SUITE=simple env: USE_YARN=yes TEST_SUITE=simple
...@@ -65,8 +65,6 @@ set -x ...@@ -65,8 +65,6 @@ set -x
cd .. cd ..
root_path=$PWD root_path=$PWD
npm install
# If the node version is < 4, the script should just give an error. # If the node version is < 4, the script should just give an error.
if [[ `node --version | sed -e 's/^v//' -e 's/\..*//g'` -lt 4 ]] if [[ `node --version | sed -e 's/^v//' -e 's/\..*//g'` -lt 4 ]]
then then
...@@ -75,6 +73,8 @@ then ...@@ -75,6 +73,8 @@ then
[[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1 [[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1
fi fi
npm install
if [ "$USE_YARN" = "yes" ] if [ "$USE_YARN" = "yes" ]
then then
# Install Yarn so that the test can use it to install packages. # Install Yarn so that the test can use it to install packages.
......
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