From be4ff49c1229b24b231b5d5e166c8f2a246a1aaa Mon Sep 17 00:00:00 2001
From: Serge Latyntcev <dnsl48@gmail.com>
Date: Fri, 26 Jul 2019 12:56:40 +1200
Subject: [PATCH] Enhancement / Update travis config to use Xenial

---
 .travis.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1c030b0..21aaac1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,11 @@
 language: php
 
-dist: trusty
+dist: xenial
 
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install chromium-chromedriver
+services:
+  - mysql
+  - postgresql
+  - xvfb
 
 cache:
   directories:
@@ -14,13 +15,13 @@ addons:
   apt:
     packages:
       - tidy
+      - chromium-chromedriver
+      - chromium-browser
 
 env:
   global:
     - TRAVIS_NODE_VERSION="6"
     - COMPOSER_ROOT_VERSION="4.5.x-dev"
-    - DISPLAY=":99"
-    - XVFBARGS=":99 -ac -screen 0 1024x768x16"
     - SS_BASE_URL="http://localhost:8080/"
     - SS_ENVIRONMENT_TYPE="dev"
 
@@ -74,6 +75,11 @@ before_script:
 # Extra $PATH
   - export PATH=/usr/lib/chromium-browser/:$PATH
 
+# Remove preinstalled Chrome (google-chrome)
+  # this would conflict with our chromium-browser installation
+  # and its version is incompatible with chromium-chromedriver
+  - sudo apt-get remove -y --purge google-chrome-stable || true
+
 # Init PHP
   - phpenv rehash
   - phpenv config-rm xdebug.ini || true
@@ -90,7 +96,6 @@ before_script:
 # Start behat services
   - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then mkdir artifacts; fi
   - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then cp composer.lock artifacts/; fi
-  - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi
   - if [[ $BEHAT_TEST ]]; then (chromedriver > artifacts/chromedriver.log 2>&1 &); fi
   - if [[ $BEHAT_TEST ]] || [[ $HEALTH_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); sleep 3; fi