move to PHP-7.4 as current GA

diff --git a/.travis.yml b/.travis.yml
index 7da2b1c5514b0f554b2785189e3a5b235a08e35d..855d29fce981b7e40143918bbeda34589e22bd11 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,17 +13,16 @@ env:
   - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes
   - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes
   - PHP=7.2 enable_debug=yes enable_maintainer_zts=yes
-  - PHP=7.4 enable_debug=yes enable_maintainer_zts=yes
-  - PHP=master enable_debug=yes enable_maintainer_zts=yes
-  - PHP=7.3 enable_debug=no enable_maintainer_zts=no
-  - PHP=7.3 enable_debug=yes enable_maintainer_zts=no
-  - PHP=7.3 enable_debug=no enable_maintainer_zts=yes
   - PHP=7.3 enable_debug=yes enable_maintainer_zts=yes
+  - PHP=master enable_debug=yes enable_maintainer_zts=yes
+  - PHP=7.4 enable_debug=no enable_maintainer_zts=no
+  - PHP=7.4 enable_debug=yes enable_maintainer_zts=no
+  - PHP=7.4 enable_debug=no enable_maintainer_zts=yes
+  - PHP=7.4 enable_debug=yes enable_maintainer_zts=yes
 
 matrix:
  fast_finish: true
  allow_failures:
-  - env: PHP=7.4 enable_debug=yes enable_maintainer_zts=yes
   - env: PHP=master enable_debug=yes enable_maintainer_zts=yes
 
 before_script:

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 2c947641e871ee742fd5898c704eb58ed6b44c42..7571ce35840b6a9b9d62bbd997d506272e25e368 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -13,10 +13,10 @@ addons:
 env:
 <?php
 
-$cur = "7.3";
+$cur = "7.4";
 $gen = include "./travis/pecl/gen-matrix.php";
 $env = $gen([
-       "PHP" => ["7.0", "7.1", "7.2", "7.4", "master"],
+       "PHP" => ["7.0", "7.1", "7.2", "7.3", "master"],
        "enable_debug" => "yes",
        "enable_maintainer_zts" => "yes",
 ], [
@@ -37,7 +37,7 @@ matrix:
  allow_failures:
 <?php
 $allow_failures = array_merge( ... array_map(function($a) {
-       return preg_grep('/^PHP=(master|7.4) /', $a);
+       return preg_grep('/^PHP=(master) /', $a);
 }, $env));
 foreach ($allow_failures as $e) {
        printf("  - env: %s\n", $e);