travis: allow_failures

diff --git a/.travis.yml b/.travis.yml
index 51d7e6be28c8c961d3201354cdbe7a2911407d43..644b0d910f24071b39c45bcf436e1c1e6802d22d 100644 (file)
--- 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 96294f42df794099afdf1e2a3b989215bd6e9bcf..d4e409fbdf0372e3c1b1642a839c3ad6fc3a1e1c 100755 (executable)
--- 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: