add master to the test matrix

diff --git a/.travis.yml b/.travis.yml
index 0de97215cd8ce8d61eaf2ec00a1bb484badddd59..7b148c42273e5811d492cc2c8ebc204e74d298b2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,5 @@
 # autogenerated file; do not edit
+sudo: false
 language: c
 
 addons:
@@ -12,21 +13,24 @@ env:
   - PHP=5.4 enable_debug=no enable_maintainer_zts=no enable_json=yes
   - PHP=5.5 enable_debug=no enable_maintainer_zts=no enable_json=yes
   - PHP=5.6 enable_debug=no enable_maintainer_zts=no enable_json=yes
+  - PHP=master enable_debug=no enable_maintainer_zts=no enable_json=yes
   - PHP=5.4 enable_debug=yes enable_maintainer_zts=no enable_json=yes
   - PHP=5.5 enable_debug=yes enable_maintainer_zts=no enable_json=yes
   - PHP=5.6 enable_debug=yes enable_maintainer_zts=no enable_json=yes
+  - PHP=master enable_debug=yes enable_maintainer_zts=no enable_json=yes
   - PHP=5.4 enable_debug=no enable_maintainer_zts=yes enable_json=yes
   - PHP=5.5 enable_debug=no enable_maintainer_zts=yes enable_json=yes
   - PHP=5.6 enable_debug=no enable_maintainer_zts=yes enable_json=yes
+  - PHP=master enable_debug=no enable_maintainer_zts=yes enable_json=yes
   - PHP=5.4 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - PHP=5.5 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - PHP=5.6 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
+  - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
 
 before_script:
  - make -f travis/pecl/Makefile php
+ - make -f travis/pecl/Makefile ext PECL=json_post
 
 script:
- - make -f travis/pecl/Makefile ext PECL=json_post
  - make -f travis/pecl/Makefile test
 
-sudo: false

diff --git a/gen_travis_yml.php b/gen_travis_yml.php
index 317855570aaa8e8557b89b560474f5cd78e6404b..e7b7cb4c8b531e43103e0af01f8a242288b0a68a 100755 (executable)
--- a/gen_travis_yml.php
+++ b/gen_travis_yml.php
@@ -1,5 +1,6 @@
 #!/usr/bin/env php
 # autogenerated file; do not edit
+sudo: false
 language: c
 
 addons:
@@ -14,7 +15,7 @@ env:
 
 $gen = include "./travis/pecl/gen-matrix.php";
 $env = $gen([
-       "PHP" => ["5.4", "5.5", "5.6"],
+       "PHP" => ["5.4", "5.5", "5.6", "master"],
        "enable_debug",
        "enable_maintainer_zts",
        "enable_json" => ["yes"],
@@ -27,9 +28,8 @@ foreach ($env as $e) {
 
 before_script:
  - make -f travis/pecl/Makefile php
+ - make -f travis/pecl/Makefile ext PECL=json_post
 
 script:
- - make -f travis/pecl/Makefile ext PECL=json_post
  - make -f travis/pecl/Makefile test
 
-sudo: false

diff --git a/travis/pecl b/travis/pecl
index 0815aa6d8727870e6bf8409700925abfaaf2b723..3d880c84e94ed6eee885dec36931d67d37232fea 160000 (submodule)
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit 0815aa6d8727870e6bf8409700925abfaaf2b723
+Subproject commit 3d880c84e94ed6eee885dec36931d67d37232fea