From fc2219dc72b180e82d6df41f3a4c0e830f811094 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 12 Apr 2017 09:16:11 +1200
Subject: [PATCH] .travis.yml code cleanup Fixed indentation Move coverage
 build to script Update travis node version to 6 Update npm to use yarn for CI

---
 .travis.yml | 66 ++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 321e8624..64826814 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,10 @@ addons:
 
 env:
   global:
-    - TRAVIS_NODE_VERSION="4"
-    - CORE_RELEASE=4
+    - TRAVIS_NODE_VERSION="6"
     - COMPOSER_ROOT_VERSION="4.0.x-dev"
+    - DISPLAY=":99"
+    - XVFBARGS=":99 -ac -screen 0 1024x768x16"
 
 matrix:
   include:
@@ -30,41 +31,40 @@ matrix:
       env: NPM_TEST=1
 
 before_script:
- - "if [ \"$PHPCS_TEST\" = \"1\" ]; then pyrus install pear/PHP_CodeSniffer; fi"
- - phpenv rehash
- - phpenv config-rm xdebug.ini
- - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
- - composer install --prefer-dist
- - composer require --update-with-dependencies silverstripe/framework:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev --prefer-dist
- - "if [ \"$DB\" = \"PGSQL\" ]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi"
- - "if [ \"$DB\" = \"SQLITE\" ]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi"
- - "php ./tests/bootstrap/mysite.php"
- - "export DISPLAY=\":99\""
- - "export XVFBARGS=\":99 -ac -screen 0 1024x768x16\""
- - "if [ \"$NPM_TEST\" = \"1\" ]; then (nvm install $TRAVIS_NODE_VERSION && npm install --silent && npm run build); fi"
- - "if [[ $BEHAT_TEST ]]; then echo 'SS_BASE_URL=http://localhost:8080/' >> .env; fi"
- - "if [ \"$BEHAT_TEST\" = \"1\" ]; then sh -e /etc/init.d/xvfb start; sleep 3; fi"
- - "if [ \"$BEHAT_TEST\" = \"1\" ]; then (vendor/bin/selenium-server-standalone > selenium.log 2>&1 &); fi"
- - "if [ \"$BEHAT_TEST\" = \"1\" ]; then (vendor/bin/serve --bootstrap-file tests/behat/serve-bootstrap.php &> serve.log &); fi"
+# Init PHP
+  - if [[ $PHPCS_TEST ]]; then pyrus install pear/PHP_CodeSniffer; fi
+  - phpenv rehash
+  - phpenv config-rm xdebug.ini
+  - echo 'memory_limit = 2G' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+
+# Install composer dependencies
+  - composer install --prefer-dist
+  - composer require --update-with-dependencies silverstripe/framework:4.0.x-dev silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/assets:1.0.x-dev silverstripe/versioned:1.0.x-dev --prefer-dist
+  - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi
+  - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi
+
+# Bootstrap cms / mysite folder
+  - php ./tests/bootstrap/mysite.php
+
+# Install NPM dependencies
+  - if [[ $NPM_TEST ]]; then nvm install $TRAVIS_NODE_VERSION && nvm use $TRAVIS_NODE_VERSION && npm install -g yarn && yarn install --network-concurrency 1 && yarn run build; fi
+
+# Start behat services
+  - if [[ $BEHAT_TEST ]]; then echo 'SS_BASE_URL=http://localhost:8080/' >> .env; fi
+  - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi
+  - if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > selenium.log 2>&1 &); fi
+  - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file tests/behat/serve-bootstrap.php &> serve.log &); fi
 
 script:
- - "if [ \"$PHPUNIT_TEST\" = \"1\" ]; then vendor/bin/phpunit tests flush=1; fi"
- - "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi"
- - "if [ \"$NPM_TEST\" = \"1\" ]; then git diff-files --quiet -w --relative=client; fi"
- - "if [ \"$NPM_TEST\" = \"1\" ]; then git diff -w --no-color --relative=client; fi"
- - "if [ \"$NPM_TEST\" = \"1\" ]; then (nvm use $TRAVIS_NODE_VERSION && npm run lint); fi"
- - "if [ \"$PHPCS_TEST\" = \"1\" ]; then composer run-script lint; fi"
+ - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests flush=1; fi
+ - if [[ $BEHAT_TEST ]]; then vendor/bin/behat @cms; fi
+ - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi
+ - if [[ $NPM_TEST ]]; then git diff -w --no-color --relative=client; fi
+ - if [[ $NPM_TEST ]]; then yarn run lint; fi
+ - if [[ $PHPCS_TEST ]]; then composer run-script lint; fi
 
 after_success:
- - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ]; then vendor/bin/phpunit tests flush=1 --coverage-clover=coverage.xml; fi"
- - "if [ \"$PHPUNIT_COVERAGE_TEST\" = \"1\" ]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi"
+  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
 
 after_failure:
  - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/
-
-branches:
-  except:
-    - 2.1
-    - 2.2
-    - 2.3
-    - translation-staging