gh-actions: regen right yaml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b1d5fac49ca044c5e0268fd5a4400920b4f1349..6e904baaab647cef9264badf308785cbb4998c24 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,10 +10,9 @@ jobs:
   old-matrix-0:
     name: old-matrix-0
     env:
   old-matrix-0:
     name: old-matrix-0
     env:

-      PHP: "7.0"
+      PHP: "5.6"

       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"

-      PECLs: "propro,pecl_http:http:3.2.4"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -24,23 +23,13 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
-        run: |
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -48,10 +37,9 @@ jobs:
   old-matrix-1:
     name: old-matrix-1
     env:
   old-matrix-1:
     name: old-matrix-1
     env:

-      PHP: "7.1"
+      PHP: "7.0"

       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"

-      PECLs: "propro,pecl_http:http:3.2.4"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -62,23 +50,13 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
-        run: |
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -86,10 +64,9 @@ jobs:
   old-matrix-2:
     name: old-matrix-2
     env:
   old-matrix-2:
     name: old-matrix-2
     env:

-      PHP: "7.2"
+      PHP: "7.1"

       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"

-      PECLs: "propro,pecl_http:http:3.2.4"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -100,23 +77,13 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
-        run: |
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -124,10 +91,9 @@ jobs:
   old-matrix-3:
     name: old-matrix-3
     env:
   old-matrix-3:
     name: old-matrix-3
     env:

-      PHP: "7.3"
+      PHP: "7.2"

       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"

-      PECLs: "propro,pecl_http:http:3.2.4"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -138,23 +104,13 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
-        run: |
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -162,10 +118,9 @@ jobs:
   old-matrix-4:
     name: old-matrix-4
     env:
   old-matrix-4:
     name: old-matrix-4
     env:

-      PHP: "7.4"
+      PHP: "7.3"

       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"

-      PECLs: "propro,pecl_http:http:3.2.4"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -176,23 +131,40 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
+          make -f scripts/ci/Makefile ext PECL=json_post
+      - name: Test
+        run: |
+          make -f scripts/ci/Makefile test
+
+  old-matrix-5:
+    name: old-matrix-5
+    env:
+      PHP: "7.4"
+      enable_debug: "yes"
+      enable_maintainer_zts: "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 \
+            re2c
+      - name: Prepare
+        run: |
+          make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
+      - name: Build

         run: |
         run: |

-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -204,7 +176,6 @@ jobs:
       PHP: "master"
       enable_debug: "yes"
       enable_zts: "yes"
       PHP: "master"
       enable_debug: "yes"
       enable_zts: "yes"

-      PECLs: "m6w6/ext-http:http:master"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -215,23 +186,13 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
-        run: |
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -242,7 +203,6 @@ jobs:
       PHP: "8.0"
       enable_debug: "yes"
       enable_zts: "yes"
       PHP: "8.0"
       enable_debug: "yes"
       enable_zts: "yes"

-      PECLs: "pecl_http:http:4.0.0"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -253,23 +213,13 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
-        run: |
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -280,7 +230,6 @@ jobs:
       PHP: "8.0"
       enable_debug: "no"
       enable_zts: "yes"
       PHP: "8.0"
       enable_debug: "no"
       enable_zts: "yes"

-      PECLs: "pecl_http:http:4.0.0"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -291,23 +240,13 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
-        run: |
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -318,7 +257,6 @@ jobs:
       PHP: "8.0"
       enable_debug: "yes"
       enable_zts: "no"
       PHP: "8.0"
       enable_debug: "yes"
       enable_zts: "no"

-      PECLs: "pecl_http:http:4.0.0"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -329,23 +267,13 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
-        run: |
-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test


@@ -356,7 +284,6 @@ jobs:
       PHP: "8.0"
       enable_debug: "no"
       enable_zts: "no"
       PHP: "8.0"
       enable_debug: "no"
       enable_zts: "no"

-      PECLs: "pecl_http:http:4.0.0"

     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2


@@ -367,24 +294,46 @@ jobs:
           sudo apt-get install -y \
             php-cli \
             php-pear \
           sudo apt-get install -y \
             php-cli \
             php-pear \

-            libcurl4-openssl-dev \

             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |
             re2c
       - name: Prepare
         run: |
           make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
       - name: Build
         run: |

-          make -f scripts/ci/Makefile ext PECL=raphf
-      - name: Prepare Test
+          make -f scripts/ci/Makefile ext PECL=json_post
+      - name: Test

         run: |
         run: |

-          if test -n "$PECLs"; then
-            IFS=$','
-            for pecl in $PECLs; do
-              make -f scripts/ci/Makefile pecl PECL=$pecl
-            done
-            unset IFS
-          fi
+          make -f scripts/ci/Makefile test
+
+  cur-cov-0:
+    name: cur-cov-0
+    env:
+      CFLAGS: "-O0 -g --coverage"
+      CXXFLAGS: "-O0 -g --coverage"
+      PHP: "8.0"
+    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 \
+            re2c
+      - name: Prepare
+        run: |
+          make -f scripts/ci/Makefile php || make -f scripts/ci/Makefile clean php
+      - name: Build
+        run: |
+          make -f scripts/ci/Makefile ext PECL=json_post

       - name: Test
         run: |
           make -f scripts/ci/Makefile test
       - name: Test
         run: |
           make -f scripts/ci/Makefile test

+      - name: Coverage
+        if: success()
+        run: |
+          cd .libs
+          bash <(curl -s https://codecov.io/bash) -X xcode -X coveragepy