From: Michael Wallner Date: Thu, 19 Jul 2018 11:26:45 +0000 (+0200) Subject: travis: test 7.3, rebuild master X-Git-Tag: v2.1.5~3 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=e00dd6db695d2d0f0937e8bc250df7640f78602f;p=m6w6%2Fext-pq travis: test 7.3, rebuild master --- diff --git a/.travis.yml b/.travis.yml index 6a0c2ee..f910f11 100644 --- 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 10e0216..b2f863f 100755 --- 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 b6683bb..dd0a2e6 160000 --- a/travis/pecl +++ b/travis/pecl @@ -1 +1 @@ -Subproject commit b6683bb97ca8618dacf7d101e5844d1bb1b2838a +Subproject commit dd0a2e61211836ac7b24a271a5bd68af99dee3d6