X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=scripts%2Fgen_github_workflow_ci.php;h=c23f23ec9598fb1a98f10829f7b2eec991b2b4ab;hb=6182cbb81110e28b44f724c401ce1b96b4582d6a;hp=dc6ea6b56e4b506af1800099d284d933647a2866;hpb=73402eaf86a6e4d8e2894a1d59f04edff8373a4e;p=m6w6%2Fext-http

diff --git a/scripts/gen_github_workflow_ci.php b/scripts/gen_github_workflow_ci.php
index dc6ea6b..c23f23e 100755
--- a/scripts/gen_github_workflow_ci.php
+++ b/scripts/gen_github_workflow_ci.php
@@ -11,58 +11,49 @@ jobs:
 <?php
 
 $gen = include __DIR__ . "/ci/gen-matrix.php";
-$cur = "7.4";
+$cur = "8.0";
 $job = $gen->github([
-"old-matrix" => [
+"next" => [
 // most useful for all additional versions except current
-	"PHP" => ["7.0", "7.1", "7.2", "7.3"],
-	"enable_debug" => "yes",
-	"enable_maintainer_zts" => "yes",
-	"enable_json" => "yes",
-	"enable_hash" => "yes",
-	"enable_iconv" => "yes",
-], 
+    "PHP" => ["8.1", "master"],
+    "enable_debug" => "yes",
+    "enable_zts" => "yes",
+    "enable_iconv" => "yes",
+    "TEST_PHP_ARGS" => "-d error_reporting=24575" // ignore E_DEPRECATED
+],
 "cur-none" => [
 // everything disabled for current
-	"PHP" => $cur,
-	"with_http_libicu_dir" => "no",
-	"with_http_libidn_dir" => "no",
-	"with_http_libidn2_dir" => "no",
-	"with_http_libcurl_dir" => "no",
-	"with_http_libevent_dir" => "no",
-	"with_http_libbrotli_dir" => "no",
-], 
+    "PHP" => $cur,
+    "with_http_libicu_dir" => "no",
+    "with_http_libidn_dir" => "no",
+    "with_http_libidn2_dir" => "no",
+    "with_http_libcurl_dir" => "no",
+    "with_http_libevent_dir" => "no",
+    "with_http_libbrotli_dir" => "no",
+],
 "cur-dbg-zts" => [
 // 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_iconv" => "yes",
-], 
+    "PHP" => $cur,
+    "enable_debug",
+    "enable_zts",
+    "enable_iconv" => "yes",
+],
 "cur-cov" => [
 // once everything enabled for current, with coverage
-	"CFLAGS" => "-O0 -g --coverage",
-	"CXXFLAGS" => "-O0 -g --coverage",
-	"PHP" => $cur,
-	"PECLs" => "event",			// for tests/client029.phpt
-	"enable_sockets" => "yes",	// needed by pecl/event
-	"enable_json" => "yes",
-	"enable_hash" => "yes",
-	"enable_iconv" => "yes",
-	[
-		"with_http_libicu_dir",
-		"with_http_libidn_dir",
-		"with_http_libidn2_dir",
-	],
+    "CFLAGS" => "-O0 -g --coverage",
+    "CXXFLAGS" => "-O0 -g --coverage",
+    "PHP" => $cur,
+    "enable_iconv" => "yes",
+    [
+        // mutually exclusive
+        "with_http_libicu_dir",
+        "with_http_libidn_dir",
+        "with_http_libidn2_dir",
+    ],
 ]]);
-
 foreach ($job as $id => $env) {
     printf("  %s:\n", $id);
-    printf("    name: %s\n", $id);
+    printf("    name: \"%s (%s)\"\n", $id, $env["PHP"]);
     if ($env["PHP"] == "master") {
         printf("    continue-on-error: true\n");
     }
@@ -82,7 +73,6 @@ foreach ($job as $id => $env) {
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -93,15 +83,6 @@ foreach ($job as $id => $env) {
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
           make -f scripts/ci/Makefile pecl PECL=m6w6/ext-raphf.git:raphf:master
-          make -f scripts/ci/Makefile pecl PECL=m6w6/ext-propro.git:propro:master
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
-
       - name: Build
         run: |
           make -f scripts/ci/Makefile ext PECL=http