X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=scripts%2Fgen_travis_yml.php;h=ef73806fe757f2873e6d85952e4f279d496b979f;hp=d4e409fbdf0372e3c1b1642a839c3ad6fc3a1e1c;hb=f0d09200dc7b739366bceb61d86a35fe734e09f5;hpb=f7bda4412c966a3eb3d930cca798694bb321fa1a

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index d4e409f..ef73806 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -5,13 +5,16 @@ language: c
 addons:
  apt:
   packages:
-   - php5-cli
+   - php-cli
    - php-pear
    - libcurl4-openssl-dev
    - libidn11-dev
    - libidn2-0-dev
    - libicu-dev
    - libevent-dev
+   - libbrotli-dev
+
+dist: xenial
 
 compiler:
  - gcc
@@ -37,7 +40,6 @@ $env = $gen([
 	"enable_json" => "yes",
 	"enable_hash" => "yes",
 	"enable_iconv" => "yes",
-	"with_http_libbrotli_dir" => "/home/travis/brotli"
 ], [
 // everything disabled for current
 	"PHP" => $cur,
@@ -46,6 +48,7 @@ $env = $gen([
 	"with_http_libidn2_dir" => "no",
 	"with_http_libcurl_dir" => "no",
 	"with_http_libevent_dir" => "no",
+	"with_http_libbrotli_dir" => "no",
 ], [
 // everything enabled for current, switching on debug/zts
 	"PHP" => $cur,
@@ -54,7 +57,6 @@ $env = $gen([
 	"enable_json" => "yes",
 	"enable_hash" => "yes",
 	"enable_iconv" => "yes",
-	"with_http_libbrotli_dir" => "/home/travis/brotli",
 ], [
 // once everything enabled for current, with coverage
 	"CFLAGS" => "'-O0 -g --coverage'",
@@ -63,19 +65,14 @@ $env = $gen([
 	"enable_json" => "yes",
 	"enable_hash" => "yes",
 	"enable_iconv" => "yes",
-	"with_http_libbrotli_dir" => "/home/travis/brotli",
 	[
 		"with_http_libicu_dir",
 		"with_http_libidn_dir",
 		"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);
 	}
 }
@@ -85,13 +82,15 @@ 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);
 }
 ?>
 
 install:
- - ./travis/brotli.sh v1.0.2
  - |
    if test "$PHP" = master; then \
      make -f travis/pecl/Makefile reconf; \