From 5aa1ca9afb76e5efdd12b36423b38737c2986e54 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 15 Jun 2017 11:36:19 +1200 Subject: [PATCH 1/2] Add PHP7 + SS3.6 build to Travis configuration --- .travis.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0229e29..20e51bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details +# See https://github.com/silverstripe/silverstripe-travis-support for setup details sudo: false @@ -8,11 +8,9 @@ php: - 5.3 - 5.4 - 5.5 - - 5.6 - - 7.0 env: - - DB=MYSQL CORE_RELEASE=3.2 + - DB=MYSQL CORE_RELEASE=3.5 matrix: include: @@ -22,12 +20,12 @@ matrix: env: DB=MYSQL CORE_RELEASE=3.1 - php: 5.6 env: DB=PGSQL CORE_RELEASE=3.2 - allow_failures: - - php: 7.0 + - php: 7.1 + env: DB=MYSQL CORE_RELEASE=3.6 before_script: - composer self-update || true - - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support + - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - cd ~/builds/ss - composer install From 2af878f6fafe4b17df09bad3eac7e16d35249863 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 15 Jun 2017 13:24:36 +1200 Subject: [PATCH 2/2] Move userforms requirement to travis setup call --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20e51bf..198f057 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,8 @@ matrix: before_script: - composer self-update || true - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support - - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss + - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/userforms - cd ~/builds/ss - - composer install - - composer require silverstripe/userforms script: - vendor/bin/phpunit spamprotection/tests