From a3afb0f6028ef727369b91a69258397a7a97d90e Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Mon, 13 Feb 2017 10:18:33 -0500 Subject: [PATCH 1/3] Revert "Don't run CI on Node 0.10" --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index aa61d9eb976..8f358246614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,7 @@ env: - TEST_SUITE=kitchensink matrix: include: + - node_js: 0.10 + env: TEST_SUITE=simple - node_js: 6 env: USE_YARN=yes TEST_SUITE=simple From 203fb3f93f181c5b576bff0f885092a2a874acea Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Mon, 13 Feb 2017 11:48:53 -0500 Subject: [PATCH 2/3] Install after checking node version --- tasks/e2e-simple.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/e2e-simple.sh b/tasks/e2e-simple.sh index 0ba34a8064e..20aa16293e0 100755 --- a/tasks/e2e-simple.sh +++ b/tasks/e2e-simple.sh @@ -65,8 +65,6 @@ set -x cd .. root_path=$PWD -npm install - # 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 ]] then @@ -75,6 +73,8 @@ then [[ $err_output =~ You\ are\ running\ Node ]] && exit 0 || exit 1 fi +npm install + if [ "$USE_YARN" = "yes" ] then # Install Yarn so that the test can use it to install packages. From 992cf7532a351b83e0c6bf1e2bd3629dbe0eef49 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Mon, 13 Feb 2017 13:49:33 -0500 Subject: [PATCH 3/3] Don't use travis install --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8f358246614..524224e9f6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ cache: - node_modules - packages/create-react-app/node_modules - packages/react-scripts/node_modules +install: true script: - 'if [ $TEST_SUITE = "simple" ]; then tasks/e2e-simple.sh; fi' - 'if [ $TEST_SUITE = "installs" ]; then tasks/e2e-installs.sh; fi'