X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Fci.yml;h=2ed701ca80b3919de6e3eb2c8ab8b8249444c67a;hb=bb947e44a91401fcc622d0cc023dc501c4ffa2b0;hp=93450912f300ec00052415d093091cf192a96f9a;hpb=73402eaf86a6e4d8e2894a1d59f04edff8373a4e;p=m6w6%2Fext-http

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9345091..2ed701c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,15 +7,14 @@ on:
   pull_request:
 
 jobs:
-  old-matrix-0:
-    name: old-matrix-0
+  next-0:
+    name: "next-0 (8.1)"
     env:
-      PHP: "7.0"
+      PHP: "8.1"
       enable_debug: "yes"
-      enable_maintainer_zts: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
+      enable_zts: "yes"
       enable_iconv: "yes"
+      TEST_PHP_ARGS: "-d error_reporting=24575"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -27,101 +26,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
-            libidn11-dev \
-            libidn2-0-dev \
-            libicu-dev \
-            libevent-dev \
-            libbrotli-dev \
-            re2c
-      - name: Prepare
-        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
-      - name: Test
-        run: |
-          make -f scripts/ci/Makefile test
-
-  old-matrix-1:
-    name: old-matrix-1
-    env:
-      PHP: "7.1"
-      enable_debug: "yes"
-      enable_maintainer_zts: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
-      enable_iconv: "yes"
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Install
-        run: |
-          sudo apt-get install -y \
-            php-cli \
-            php-pear \
-            libcurl4-openssl-dev \
-            libevent-dev \
-            libidn11-dev \
-            libidn2-0-dev \
-            libicu-dev \
-            libevent-dev \
-            libbrotli-dev \
-            re2c
-      - name: Prepare
-        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
-      - name: Test
-        run: |
-          make -f scripts/ci/Makefile test
-
-  old-matrix-2:
-    name: old-matrix-2
-    env:
-      PHP: "7.2"
-      enable_debug: "yes"
-      enable_maintainer_zts: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
-      enable_iconv: "yes"
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Install
-        run: |
-          sudo apt-get install -y \
-            php-cli \
-            php-pear \
-            libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -132,15 +36,6 @@ jobs:
         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
@@ -148,15 +43,15 @@ jobs:
         run: |
           make -f scripts/ci/Makefile test
 
-  old-matrix-3:
-    name: old-matrix-3
+  next-1:
+    name: "next-1 (master)"
+    continue-on-error: true
     env:
-      PHP: "7.3"
+      PHP: "master"
       enable_debug: "yes"
-      enable_maintainer_zts: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
+      enable_zts: "yes"
       enable_iconv: "yes"
+      TEST_PHP_ARGS: "-d error_reporting=24575"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -168,7 +63,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -179,15 +73,6 @@ jobs:
         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
@@ -196,9 +81,9 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-none-0:
-    name: cur-none-0
+    name: "cur-none-0 (8.0)"
     env:
-      PHP: "7.4"
+      PHP: "8.0"
       with_http_libicu_dir: "no"
       with_http_libidn_dir: "no"
       with_http_libidn2_dir: "no"
@@ -216,7 +101,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -227,15 +111,6 @@ jobs:
         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
@@ -244,15 +119,11 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-dbg-zts-0:
-    name: cur-dbg-zts-0
+    name: "cur-dbg-zts-0 (8.0)"
     env:
-      PHP: "7.4"
-      PECLs: "event"
-      enable_sockets: "yes"
+      PHP: "8.0"
       enable_debug: "yes"
-      enable_maintainer_zts: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
+      enable_zts: "yes"
       enable_iconv: "yes"
     runs-on: ubuntu-20.04
     steps:
@@ -265,7 +136,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -276,15 +146,6 @@ jobs:
         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
@@ -293,15 +154,11 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-dbg-zts-1:
-    name: cur-dbg-zts-1
+    name: "cur-dbg-zts-1 (8.0)"
     env:
-      PHP: "7.4"
-      PECLs: "event"
-      enable_sockets: "yes"
+      PHP: "8.0"
       enable_debug: "no"
-      enable_maintainer_zts: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
+      enable_zts: "yes"
       enable_iconv: "yes"
     runs-on: ubuntu-20.04
     steps:
@@ -314,7 +171,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -325,15 +181,6 @@ jobs:
         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
@@ -342,15 +189,11 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-dbg-zts-2:
-    name: cur-dbg-zts-2
+    name: "cur-dbg-zts-2 (8.0)"
     env:
-      PHP: "7.4"
-      PECLs: "event"
-      enable_sockets: "yes"
+      PHP: "8.0"
       enable_debug: "yes"
-      enable_maintainer_zts: "no"
-      enable_json: "yes"
-      enable_hash: "yes"
+      enable_zts: "no"
       enable_iconv: "yes"
     runs-on: ubuntu-20.04
     steps:
@@ -363,7 +206,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -374,15 +216,6 @@ jobs:
         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
@@ -391,15 +224,11 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-dbg-zts-3:
-    name: cur-dbg-zts-3
+    name: "cur-dbg-zts-3 (8.0)"
     env:
-      PHP: "7.4"
-      PECLs: "event"
-      enable_sockets: "yes"
+      PHP: "8.0"
       enable_debug: "no"
-      enable_maintainer_zts: "no"
-      enable_json: "yes"
-      enable_hash: "yes"
+      enable_zts: "no"
       enable_iconv: "yes"
     runs-on: ubuntu-20.04
     steps:
@@ -412,7 +241,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -423,15 +251,6 @@ jobs:
         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
@@ -440,15 +259,11 @@ jobs:
           make -f scripts/ci/Makefile test
 
   cur-cov-0:
-    name: cur-cov-0
+    name: "cur-cov-0 (8.0)"
     env:
       CFLAGS: "-O0 -g --coverage"
       CXXFLAGS: "-O0 -g --coverage"
-      PHP: "7.4"
-      PECLs: "event"
-      enable_sockets: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
+      PHP: "8.0"
       enable_iconv: "yes"
       with_http_libicu_dir: "yes"
       with_http_libidn_dir: "no"
@@ -464,7 +279,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -475,15 +289,6 @@ jobs:
         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
@@ -497,15 +302,11 @@ jobs:
           bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy
 
   cur-cov-1:
-    name: cur-cov-1
+    name: "cur-cov-1 (8.0)"
     env:
       CFLAGS: "-O0 -g --coverage"
       CXXFLAGS: "-O0 -g --coverage"
-      PHP: "7.4"
-      PECLs: "event"
-      enable_sockets: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
+      PHP: "8.0"
       enable_iconv: "yes"
       with_http_libicu_dir: "no"
       with_http_libidn_dir: "yes"
@@ -521,7 +322,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -532,15 +332,6 @@ jobs:
         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
@@ -554,15 +345,11 @@ jobs:
           bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy
 
   cur-cov-2:
-    name: cur-cov-2
+    name: "cur-cov-2 (8.0)"
     env:
       CFLAGS: "-O0 -g --coverage"
       CXXFLAGS: "-O0 -g --coverage"
-      PHP: "7.4"
-      PECLs: "event"
-      enable_sockets: "yes"
-      enable_json: "yes"
-      enable_hash: "yes"
+      PHP: "8.0"
       enable_iconv: "yes"
       with_http_libicu_dir: "no"
       with_http_libidn_dir: "no"
@@ -578,7 +365,6 @@ jobs:
             php-cli \
             php-pear \
             libcurl4-openssl-dev \
-            libevent-dev \
             libidn11-dev \
             libidn2-0-dev \
             libicu-dev \
@@ -589,15 +375,6 @@ jobs:
         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