From 250d21347ff4daf65eac40236ab51a8d5c3bb1e0 Mon Sep 17 00:00:00 2001
From: dmzx <info@dmzx-web.net>
Date: Sat, 26 Mar 2016 09:31:28 +0100
Subject: [PATCH] Version 2.0.0-RC3

---
 .travis.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa0b74c..40d7f89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+# Opt into fully virtualized infrastructure
 sudo: required
 
 language: php
@@ -18,8 +19,6 @@ matrix:
       env: DB=postgres
     - php: 5.4
       env: DB=sqlite3
-    - php: 5.4
-      env: DB=mysqli;SLOWTESTS=1
     - php: 5.5
       env: DB=mysqli
     - php: 5.6
@@ -36,14 +35,14 @@ env:
     - SNIFF="1"            # Should we run code sniffer on your code?
     - IMAGE_ICC="0"        # Should we run icc profile sniffer on your images?
     - EPV="0"              # Should we run EPV (Extension Pre Validator) on your code?
-    - PHPBB_BRANCH="develop-ascraeus"
+    - PHPBB_BRANCH="3.1.x"
 
 branches:
   only:
     - master
     - develop
     - /^develop-.*$/
-
+    - /^release-.*$/
 
 install:
   - travis_retry composer install --dev --no-interaction --prefer-source
@@ -59,4 +58,4 @@ script:
   - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
   - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
   - phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php
-  - sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.3.3' ] && [ '$DB' = 'mysqli' ]; then phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
+  - sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.3.3' ] && [ '$DB' = 'mysqli' ]; then phpBB/ext/$EXTNAME/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
\ No newline at end of file