From a57e97e2697b2e47702657356f211e2876c767ef Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 8 Mar 2019 07:07:31 +0100
Subject: [PATCH] travis: allow failure for master

---
 .travis.yml                | 34 ++++++++++++++--------------------
 scripts/gen_travis_yml.php | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a61a7a9..12b7c7c 100644
--- 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 5facac0..a79f671 100755
--- 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:
-- 
2.30.2