From f7bda4412c966a3eb3d930cca798694bb321fa1a Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 1 Mar 2019 08:14:08 +0100
Subject: [PATCH] travis: allow_failures

---
 .travis.yml                | 11 ++++++-----
 scripts/gen_travis_yml.php | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 51d7e6b..644b0d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,12 @@ compiler:
  - clang
 
 cache:
+ apt: true
  directories:
   - $HOME/cache
 before_cache:
  - find $HOME/cache -name '*.gcda' -o -name '*.gcno' -delete
 
-matrix:
- fast_finish: true
- allow_failures:
-  - env: PHP=master
-
 env:
  - PHP=7.0 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli
  - PHP=7.1 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli
@@ -41,6 +37,11 @@ env:
  - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli with_http_libidn_dir=yes with_http_libicu_dir=no with_http_libidn2_dir=no 
  - CFLAGS='-O0 -g --coverage' CXXFLAGS='-O0 -g --coverage' PHP=7.3 enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli with_http_libidn2_dir=yes with_http_libicu_dir=no with_http_libidn_dir=no 
 
+matrix:
+ fast_finish: true
+ allow_failures:
+  - env: PHP=master enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli
+
 install:
  - ./travis/brotli.sh v1.0.2
  - |
diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 96294f4..d4e409f 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -18,16 +18,12 @@ compiler:
  - clang
 
 cache:
+ apt: true
  directories:
   - $HOME/cache
 before_cache:
  - find $HOME/cache -name '*.gcda' -o -name '*.gcno' -delete
 
-matrix:
- fast_finish: true
- allow_failures:
-  - env: PHP=master
-
 env:
 <?php
 
@@ -74,12 +70,24 @@ $env = $gen([
 		"with_http_libidn2_dir",
 	],
 ]);
+$allow_failures = [];
 foreach ($env as $grp) {
 	foreach ($grp as $e) {
+		if (!strncmp($e, "PHP=master", strlen("PHP=master"))) {
+			$allow_failures[] = $e;
+		}
 		printf(" - %s\n", $e);
 	}
 }
+?>
 
+matrix:
+ fast_finish: true
+ allow_failures:
+<?php
+foreach ($allow_failures as $e) {
+	printf("  - env: %s\n", $e);
+}
 ?>
 
 install:
-- 
2.30.2