travis: allow failure for master

diff --git a/.travis.yml b/.travis.yml
index a61a7a95de0594fae4bbdd56569bfb8b96656d3e..12b7c7c7d0363c64c3577f0f8a87fa7b32f46f6c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,26 +9,20 @@ addons:
    - php-pear
 
 env:
- - PHP=7.0 enable_debug=no enable_maintainer_zts=no
- - PHP=7.1 enable_debug=no enable_maintainer_zts=no
- - PHP=7.2 enable_debug=no enable_maintainer_zts=no
- - PHP=7.3 enable_debug=no enable_maintainer_zts=no
- - PHP=master enable_debug=no enable_maintainer_zts=no
- - PHP=7.0 enable_debug=yes enable_maintainer_zts=no
- - PHP=7.1 enable_debug=yes enable_maintainer_zts=no
- - PHP=7.2 enable_debug=yes enable_maintainer_zts=no
- - PHP=7.3 enable_debug=yes enable_maintainer_zts=no
- - PHP=master enable_debug=yes enable_maintainer_zts=no
- - PHP=7.0 enable_debug=no enable_maintainer_zts=yes
- - PHP=7.1 enable_debug=no enable_maintainer_zts=yes
- - PHP=7.2 enable_debug=no enable_maintainer_zts=yes
- - PHP=7.3 enable_debug=no enable_maintainer_zts=yes
- - PHP=master enable_debug=no enable_maintainer_zts=yes
- - 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.3 enable_debug=yes enable_maintainer_zts=yes
- - PHP=master enable_debug=yes enable_maintainer_zts=yes
+ - 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.2 enable_debug=yes enable_maintainer_zts=yes enable_json=yes
+ - PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes
+ - 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
 
 before_script:
  - make -f travis/pecl/Makefile php

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 5facac0cbdaa858ed63a1b1d34e6d0ff566b6582..a79f671482d23dbec726c3b79e6089e4c6233e23 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -11,19 +11,42 @@ addons:
 
 env:
 <?php
-
 $gen = include "./travis/pecl/gen-matrix.php";
+$cur = "7.3";
 $env = $gen([
-       "PHP" => ["7.0", "7.1", "7.2", "7.3", "master"],
+       "PHP" => ["7.0", "7.1", "7.2", "master"],
+       "enable_debug" => "yes",
+       "enable_maintainer_zts" => "yes",
+       "enable_json" => "yes",
+], [
+       "PHP" => $cur,
+       "enable_json" => "yes",
        "enable_debug",
-       "enable_maintainer_zts",
+       "enable_maintainer_zts"
+], [
+       "PHP" => $cur,
+       "enable_json" => "yes",
+       "CFLAGS" => "'-O0 -g --coverage'",
+       "CXXFLAGS" => "'-O0 -g --coverage'",
 ]);
-foreach ($env as $grp) {
-       foreach ($grp as $e) {
+
+foreach ($env as $g) {
+       foreach ($g as $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);
+}
 ?>
 
 before_script: