Merge branch 'master' into fix-wp-pll-option-sync/unsync

diggy · Aug 9, 2017 · a97e694 · a97e694
2 parents f3ac5f3 + d32d8ce
commit a97e694
Show file tree

Hide file tree

Showing 2 changed files with 156 additions and 141 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 sudo: false
+dist: trusty
 
 language: php
 
@@ -29,6 +30,7 @@ env:
 matrix:
   include:
     - php: 5.3
+      dist: precise
       env: WP_VERSION=latest
     - php: 5.4
       env: WP_VERSION=latest
@@ -39,12 +41,18 @@ matrix:
     - php: 5.6
       env: WP_VERSION=trunk
     - php: 7.0
+      dist: precise
+      env: WP_VERSION=latest
+    - php: 7.1
+      env: WP_VERSION=latest
+    - php: 7.2
       env: WP_VERSION=latest
   allow_failures:
     - php: nightly
     - php: 5.3
     - php: 5.4
     - php: 5.5
+    - php: 7.2
     - env: WP_VERSION=trunk
 
 before_install: