Merge pull request #906 from deeky666/fix-travis-allowed-failures

[2.5] Fix allowed failures for HHVM + MariaDB builds on Travis

Merge pull request #906 from deeky666/fix-travis-allowed-failures
[2.5] Fix allowed failures for HHVM + MariaDB builds on Travis
6734d99f · Benjamin Eberlei · 5fbb8ae4 · 972c8750 · 6734d99f
Commit 6734d99f authored Sep 16, 2015 by Benjamin Eberlei
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

.travis.yml .travis.yml +2 -6

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,18 +110,14 @@ matrix:
      addons:
        mariadb: 10.1
  allow_failures:
-      - php: hhvm
-        env: DB=pgsql POSTGRESQL_VERSION=9.1
-      - php: hhvm
-        env: DB=pgsql POSTGRESQL_VERSION=9.2
-      - php: hhvm
-        env: DB=pgsql POSTGRESQL_VERSION=9.3
      - php: hhvm
        env: DB=sqlite
      - php: hhvm
        env: DB=mysql
      - php: hhvm
        env: DB=mysqli
+      - php: hhvm
+        env: DB=mariadb
      - php: hhvm-nightly
  exclude:
      - php: hhvm