travis: test 7.3, rebuild master

diff --git a/.travis.yml b/.travis.yml
index 6a0c2ee7d52475c8ffea2a352e68ba1325745bfd..f910f11fbef364f0a3ef867cc6b72d0750ffb0c9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ env:
  matrix:
   - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
+  - PHP=7.3 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
   - PHP=7.2 enable_json=no
   - PHP=7.2 enable_json=yes enable_debug=no enable_maintainer_zts=no
@@ -36,7 +37,12 @@ env:
   - PHP=7.2 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
 
 install:
- - make -f travis/pecl/Makefile php
+ - |
+   if test "$PHP" = master; then \
+     make -f travis/pecl/Makefile reconf; \
+     make -f travis/pecl/Makefile pecl-rm pecl-clean PECL=raphf:raphf:2.0.0; \
+   fi
+ - make -f travis/pecl/Makefile php || make -f travis/pecl/Makefile clean php
  - make -f travis/pecl/Makefile pecl PECL=raphf:raphf:2.0.0
 
 before_script:

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 10e021605018d6356d2f68228bdeaa055b267b6b..b2f863f0396b01d93a05740b5a58f04e7d0ffe56 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -31,7 +31,7 @@ env:
 $gen = include "./travis/pecl/gen-matrix.php";
 $cur = "7.2";
 $env = $gen([
-       "PHP" => ["7.0", "7.1", "master"],
+       "PHP" => ["7.0", "7.1", "7.3", "master"],
        "enable_debug" => "yes",
        "enable_maintainer_zts" => "yes",
        "enable_json" => "yes",
@@ -59,7 +59,12 @@ foreach ($env as $g) {
 ?>
 
 install:
- - make -f travis/pecl/Makefile php
+ - |
+   if test "$PHP" = master; then \
+     make -f travis/pecl/Makefile reconf; \
+     make -f travis/pecl/Makefile pecl-rm pecl-clean PECL=raphf:raphf:2.0.0; \
+   fi
+ - make -f travis/pecl/Makefile php || make -f travis/pecl/Makefile clean php
  - make -f travis/pecl/Makefile pecl PECL=raphf:raphf:2.0.0
 
 before_script:

diff --git a/travis/pecl b/travis/pecl
index b6683bb97ca8618dacf7d101e5844d1bb1b2838a..dd0a2e61211836ac7b24a271a5bd68af99dee3d6 160000 (submodule)
--- a/travis/pecl
+++ b/travis/pecl
@@ -1 +1 @@
-Subproject commit b6683bb97ca8618dacf7d101e5844d1bb1b2838a
+Subproject commit dd0a2e61211836ac7b24a271a5bd68af99dee3d6