travis: update

diff --git a/.travis.yml b/.travis.yml
index f910f11fbef364f0a3ef867cc6b72d0750ffb0c9..853c4e6cda1ed8a0f1f57b0b79528ff4fb5fe292 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,6 @@ addons:
    - php-pear
    - valgrind
 
    - php-pear
    - valgrind
 

-compiler:
- - gcc
- - clang
-

 cache:
  directories:
   - $HOME/cache
 cache:
  directories:
   - $HOME/cache


@@ -27,14 +23,19 @@ 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
  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=7.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes

   - PHP=master 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
-  - PHP=7.2 enable_json=yes enable_debug=yes enable_maintainer_zts=no
-  - PHP=7.2 enable_json=yes enable_debug=no enable_maintainer_zts=yes
-  - PHP=7.2 enable_json=yes enable_debug=yes enable_maintainer_zts=yes
-  - PHP=7.2 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
+  - PHP=7.3 enable_json=no
+  - PHP=7.3 enable_json=yes enable_debug=no enable_maintainer_zts=no
+  - PHP=7.3 enable_json=yes enable_debug=yes enable_maintainer_zts=no
+  - PHP=7.3 enable_json=yes enable_debug=no enable_maintainer_zts=yes
+  - PHP=7.3 enable_json=yes enable_debug=yes enable_maintainer_zts=yes
+  - PHP=7.3 enable_json=yes CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage'
+
+matrix:
+ fast_finish: true
+ allow_failures:
+  - env: PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes

 
 install:
  - |
 
 install:
  - |

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index b2f863f0396b01d93a05740b5a58f04e7d0ffe56..aad3848f747ec0e11ebab0def46d96be1466822e 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -11,10 +11,6 @@ addons:
    - php-pear
    - valgrind
 
    - php-pear
    - valgrind
 

-compiler:
- - gcc
- - clang
-

 cache:
  directories:
   - $HOME/cache
 cache:
  directories:
   - $HOME/cache


@@ -29,9 +25,9 @@ env:
 <?php
 
 $gen = include "./travis/pecl/gen-matrix.php";
 <?php
 
 $gen = include "./travis/pecl/gen-matrix.php";

-$cur = "7.2";
+$cur = "7.3";

 $env = $gen([
 $env = $gen([

-       "PHP" => ["7.0", "7.1", "7.3", "master"],
+       "PHP" => ["7.0", "7.1", "7.2", "master"],

        "enable_debug" => "yes",
        "enable_maintainer_zts" => "yes",
        "enable_json" => "yes",
        "enable_debug" => "yes",
        "enable_maintainer_zts" => "yes",
        "enable_json" => "yes",


@@ -55,7 +51,18 @@ foreach ($env as $g) {
                printf("  - %s\n", $e);
        }
 }
                printf("  - %s\n", $e);
        }
 }

+?>

 
 

+matrix:
+ fast_finish: true
+ allow_failures:
+<?php
+$allow_failures = array_merge( ... array_map(function($a) {
+       return preg_grep('/^PHP=master /', $a);
+}, $env));
+foreach ($allow_failures as $e) {
+       printf("  - env: %s\n", $e);
+}

 ?>
 
 install:
 ?>
 
 install: