X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=scripts%2Fgen_travis_yml.php;h=7a0c27364d15cbce59a46ae6f515385eef90aba2;hp=2f32a7458555972fa7b57c148e71167bbb2ad5b0;hb=2648e31835b892343916ef6fd3bc968923d1b75d;hpb=c37e911f6a277f735cf820ebf71d4254ddcb9812

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index 2f32a74..7a0c273 100755
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -14,8 +14,6 @@ addons:
    - libevent-dev
    - libbrotli-dev
 
-dist: xenial
-
 cache:
  apt: true
  directories:
@@ -27,14 +25,12 @@ env:
 <?php
 
 $gen = include "./travis/pecl/gen-matrix.php";
-$cur = "7.3";
+$cur = "8.0";
 $env = $gen([
 // most useful for all additional versions except current
-	"PHP" => ["7.0", "7.1", "7.2", "master"],
+	"PHP" => ["master"],
 	"enable_debug" => "yes",
-	"enable_maintainer_zts" => "yes",
-	"enable_json" => "yes",
-	"enable_hash" => "yes",
+	"enable_zts" => "yes",
 	"enable_iconv" => "yes",
 ], [
 // everything disabled for current
@@ -48,18 +44,18 @@ $env = $gen([
 ], [
 // everything enabled for current, switching debug/zts
 	"PHP" => $cur,
+//	"PECLs" => "event",			// for tests/client029.phpt
+//	"enable_sockets" => "yes",	// needed by pecl/event
 	"enable_debug",
-	"enable_maintainer_zts",
-	"enable_json" => "yes",
-	"enable_hash" => "yes",
+	"enable_zts",
 	"enable_iconv" => "yes",
 ], [
 // once everything enabled for current, with coverage
 	"CFLAGS" => "'-O0 -g --coverage'",
 	"CXXFLAGS" => "'-O0 -g --coverage'",
 	"PHP" => $cur,
-	"enable_json" => "yes",
-	"enable_hash" => "yes",
+//	"PECLs" => "event",			// for tests/client029.phpt
+//	"enable_sockets" => "yes",	// needed by pecl/event
 	"enable_iconv" => "yes",
 	[
 		"with_http_libicu_dir",
@@ -79,7 +75,7 @@ matrix:
  allow_failures:
 <?php
 $allow_failures = array_merge( ... array_map(function($a) {
-	return preg_grep('/^PHP=master /', $a);
+	return preg_grep('/^PHP=(master) /', $a);
 }, $env));
 foreach ($allow_failures as $e) {
 	printf("  - env: %s\n", $e);
@@ -90,12 +86,18 @@ install:
  - |
    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; \
+     make -f travis/pecl/Makefile pecl-rm pecl-clean PECL=m6w6/ext-raphf.git:raphf: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
+ - make -f travis/pecl/Makefile pecl PECL=m6w6/ext-raphf.git:raphf:master
+ - |
+   if test -n "$PECLs"; then \
+     IFS=$','; \
+     for pecl in $PECLs; do \
+       make -f travis/pecl/Makefile pecl PECL=$pecl; \
+     done; \
+     unset IFS; \
+   fi
 
 script:
  - make -f travis/pecl/Makefile ext PECL=http