Skip to content

Commit

Permalink
Revert "Don't run CI on Node 0.10" (#1547)
Browse files Browse the repository at this point in the history
* Revert "Don't run CI on Node 0.10"

* Install after checking node version

* Don't use travis install
  • Loading branch information
Timer committed Feb 23, 2017
1 parent 677896a commit 01f66db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -21,5 +22,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
4 changes: 2 additions & 2 deletions tasks/e2e-simple.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down

0 comments on commit 01f66db

Please sign in to comment.