Merge "Write TravisCI build matrix in more readable and extandable manner"

diff --git a/.travis.yml b/.travis.yml
index 206ead3..cbab7ee 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,19 +8,15 @@
 #
 language: php
 
-php:
-  - hhvm
-  - 5.3
-
-env:
-  - dbtype=mysql
-  - dbtype=postgres
-
-# TODO: Travis CI's hhvm does not support PostgreSQL at the moment.
 matrix:
-  exclude:
-    - php: hhvm
-      env: dbtype=postgres
+  fast_finish: true
+  include:
+    - env: dbtype=mysql
+      php: 5.3
+    - env: dbtype=postgres
+      php: 5.3
+    - env: dbtype=mysql
+      php: hhvm
 
 services:
   - mysql