X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fgen_travis_yml.php;h=18dccde8273ea594c31b3b553967b219453382b1;hb=84bb804822add42df03d7765169a58ff8234c886;hp=bd62c6dff7456f5c9e0abb2f48d4352488c95889;hpb=579fb9489fcc84c5e460b13e3022812aff25954d;p=m6w6%2Fext-http

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index bd62c6d..18dccde 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -1,25 +1,23 @@
 #!/usr/bin/env php
 # autogenerated file; do not edit
 language: c
-sudo: false
-dist: trusty
 
 addons:
  apt:
   packages:
-   - php5-cli
+   - php-cli
    - php-pear
    - libcurl4-openssl-dev
    - libidn11-dev
    - libidn2-0-dev
    - libicu-dev
    - libevent-dev
+   - libbrotli-dev
 
-compiler:
- - gcc
- - clang
+dist: xenial
 
 cache:
+ apt: true
  directories:
   - $HOME/cache
 before_cache:
@@ -29,16 +27,15 @@ env:
 <?php
 
 $gen = include "./travis/pecl/gen-matrix.php";
-$cur = "7.2";
+$cur = "7.3";
 $env = $gen([
 // most useful for all additional versions except current
-	"PHP" => ["7.0", "7.1", "7.3", "master"],
+	"PHP" => ["7.0", "7.1", "7.2", "master"],
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
 	"enable_json" => "yes",
 	"enable_hash" => "yes",
 	"enable_iconv" => "yes",
-	"with_http_libbrotli_dir" => "/home/travis/brotli"
 ], [
 // everything disabled for current
 	"PHP" => $cur,
@@ -47,15 +44,16 @@ $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
+// everything enabled for current, switching on CC and debug/zts
 	"PHP" => $cur,
+	"CC" => ["gcc", "clang"],
 	"enable_debug",
 	"enable_maintainer_zts",
 	"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'",
@@ -64,7 +62,6 @@ $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",
@@ -76,12 +73,27 @@ foreach ($env as $grp) {
 		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);
+}
 ?>
 
 install:
- - ./travis/brotli.sh v1.0.2
- - if test "$PHP" = master; then make -f travis/pecl/Makefile reconf; fi
+ - |
+   if test "$PHP" = master; then \
+     make -f travis/pecl/Makefile reconf; \
+     make -f travis/pecl/Makefile pecl-rm pecl-clean PECL=ext-raphf.git:raphf:master; \
+     make -f travis/pecl/Makefile pecl-rm pecl-clean PECL=ext-propro.git:propro:master; \
+   fi
  - make -f travis/pecl/Makefile php || make -f travis/pecl/Makefile clean php
  - make -f travis/pecl/Makefile pecl PECL=ext-raphf.git:raphf:master
  - make -f travis/pecl/Makefile pecl PECL=ext-propro.git:propro:master