From: Michael Wallner <mike@php.net>
Date: Tue, 26 Feb 2019 19:58:49 +0000 (+0100)
Subject: travis: allow failures with PHP-master
X-Git-Tag: RELEASE_3_2_1~29
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=0be5ad93bb15aa00a4e55e32f724d37f2a6262a7;p=m6w6%2Fext-http

travis: allow failures with PHP-master
---

diff --git a/.travis.yml b/.travis.yml
index 382d0ef..51d7e6b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 # autogenerated file; do not edit
 language: c
-sudo: false
-dist: trusty
 
 addons:
  apt:
@@ -24,6 +22,11 @@ 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
@@ -34,9 +37,9 @@ env:
  - PHP=7.3 enable_debug=yes enable_maintainer_zts=no enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli
  - PHP=7.3 enable_debug=no enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli
  - PHP=7.3 enable_debug=yes enable_maintainer_zts=yes enable_json=yes enable_hash=yes enable_iconv=yes with_http_libbrotli_dir=/home/travis/brotli
- - 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_libicu_dir=yes with_http_libidn_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_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
+ - 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_libicu_dir=yes with_http_libidn_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_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 
 
 install:
  - ./travis/brotli.sh v1.0.2
diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 0fe344b..96294f4 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -1,8 +1,6 @@
 #!/usr/bin/env php
 # autogenerated file; do not edit
 language: c
-sudo: false
-dist: trusty
 
 addons:
  apt:
@@ -25,6 +23,11 @@ cache:
 before_cache:
  - find $HOME/cache -name '*.gcda' -o -name '*.gcno' -delete
 
+matrix:
+ fast_finish: true
+ allow_failures:
+  - env: PHP=master
+
 env:
 <?php