From 58bd6c2248282b9ef6fb940cc6792a7b8c436fbf Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 19 Jun 2018 21:41:46 +1200 Subject: [PATCH 1/2] FIX Switch to Trusty in Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index af0a7c48b..708e8274b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: php -dist: precise +dist: trusty sudo: false From 4de82ae828917a5f459688e6b79c3d08ad6cce7e Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Tue, 19 Jun 2018 23:03:48 +1200 Subject: [PATCH 2/2] Remove duplicate localhost hostname (fixed Selenium bug) --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 708e8274b..f8ca708fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,9 @@ matrix: env: DB=MYSQL BEHAT_TEST=1 CMS_TEST=1 before_script: + # Fix bug in Selenium with duplicate localhost definitions: https://github.com/travis-ci/travis-ci/issues/3054 + - "sed 's/localhost localhost/localhost/' /etc/hosts > /tmp/etchoststmp && cat /tmp/etchoststmp | sudo tee /etc/hosts" + - export CORE_RELEASE=$TRAVIS_BRANCH - if ! [ $(phpenv version-name) = "5.3" ]; then printf "\n" | travis_retry pecl install imagick; fi - if [ $(phpenv version-name) = "5.3" ]; then printf "\n" | travis_retry pecl install imagick-3.3.0; fi