From deb80c5370dacbe411d21c3d8c190c32e7988128 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Thu, 27 Feb 2020 13:32:02 +1300 Subject: [PATCH 1/2] Upgrade Travis config to trusty Can't adopt Xenial by default as it doesn't include earlier PHP versions --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5b10d481..b8ecc663 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: php -dist: precise +dist: trusty sudo: false @@ -18,8 +18,6 @@ env: matrix: include: - - php: 5.3 - env: DB=MYSQL - php: 5.4 env: DB=PGSQL - php: 5.5 @@ -33,7 +31,7 @@ before_script: - composer self-update || true - phpenv rehash - phpenv config-rm xdebug.ini - - echo 'memory_limit = 2048M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini + - echo 'memory_limit = 3072M' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support - "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi" - "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi" From 600fe51b66f0eb462569b457ab299a629b3d723a Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Thu, 27 Feb 2020 14:04:16 +1300 Subject: [PATCH 2/2] Update Travis config to include PHP 7.4 build --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index b8ecc663..45f58787 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,12 @@ matrix: env: DB=MYSQL PDO=1 - php: 5.6 env: DB=MYSQL BEHAT_TEST=1 + - php: 7.4 + env: DB=MYSQL + dist: xenial + services: + - mysql + before_script: - composer self-update || true