From 16d684dcfaacde7f52f2611cc7450ec3c344efe2 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 15 Jun 2017 09:58:30 +1200
Subject: [PATCH 1/2] Add PHP7 + SS3.6 build to Travis configuration

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 41abb51..c0cb24d 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,12 +40,14 @@ matrix:
       env: DB=MYSQL
     - php: hhvm
       env: DB=MYSQL
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=3.6
 
 
 before_script:
   - phpenv rehash
   - 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 --require "silverstripe/comments" --require "silverstripe/widgets"
   - cd ~/builds/ss
 

From e5415b1ea805020209e64c9ea4fa06755035a79c Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Fri, 16 Jun 2017 09:11:22 +1200
Subject: [PATCH 2/2] Remove hhvm from Travis build matrix

---
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c0cb24d..aa61385 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,8 +21,6 @@ env:
     - MODULE_PATH=blog
 
 matrix:
-  allow_failures:
-    - php: hhvm-nightly
   include:
     - php: 5.6
       env: DB=MYSQL COVERAGE=1
@@ -38,8 +36,6 @@ matrix:
       env: DB=SQLITE
     - php: 5.3
       env: DB=MYSQL
-    - php: hhvm
-      env: DB=MYSQL
     - php: 7.1
       env: DB=MYSQL CORE_RELEASE=3.6