travis: fix build

[m6w6/ext-http] / scripts / gen_travis_yml.php

diff --git a/scripts/gen_travis_yml.php b/scripts/gen_travis_yml.php
index bcbd34892f06c94ed8691ae7d70fa16173d6ecf9..8aa219b6ac029cf017fc2c2fdff6e9b6ad3beb81 100755 (executable)
--- a/scripts/gen_travis_yml.php
+++ b/scripts/gen_travis_yml.php
@@ -16,10 +16,6 @@ addons:
 
 dist: xenial
 
-compiler:
- - gcc
- - clang
-
 cache:
  apt: true
  directories:
@@ -31,14 +27,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
@@ -50,20 +44,20 @@ $env = $gen([
        "with_http_libevent_dir" => "no",
        "with_http_libbrotli_dir" => "no",
 ], [
-// everything enabled for current, switching on debug/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_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",
@@ -83,7 +77,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);
@@ -91,16 +85,21 @@ foreach ($allow_failures as $e) {
 ?>
 
 install:
- - ./travis/brotli.sh v1.0.2
  - |
    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