From 50610560f4a6f6fb8e53160cc0daf581839e99ed Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 16 Nov 2021 14:51:14 +0100
Subject: [PATCH] ci: add 8.1

---
 .github/workflows/ci.yml           | 59 ++++++++++++++++++++++++------
 scripts/gen_github_workflow_ci.php | 12 +++---
 2 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 62c3b35..a546008 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   old-matrix-0:
-    name: old-matrix-0
+    name: "old-matrix-0 (7.0)"
     env:
       PHP: "7.0"
       enable_debug: "yes"
@@ -44,7 +44,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   old-matrix-1:
-    name: old-matrix-1
+    name: "old-matrix-1 (7.1)"
     env:
       PHP: "7.1"
       enable_debug: "yes"
@@ -80,7 +80,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   old-matrix-2:
-    name: old-matrix-2
+    name: "old-matrix-2 (7.2)"
     env:
       PHP: "7.2"
       enable_debug: "yes"
@@ -116,7 +116,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   old-matrix-3:
-    name: old-matrix-3
+    name: "old-matrix-3 (7.3)"
     env:
       PHP: "7.3"
       enable_debug: "yes"
@@ -152,7 +152,7 @@ jobs:
           make -f scripts/ci/Makefile test
 
   old-matrix-4:
-    name: old-matrix-4
+    name: "old-matrix-4 (7.4)"
     env:
       PHP: "7.4"
       enable_debug: "yes"
@@ -187,8 +187,43 @@ jobs:
         run: |
           make -f scripts/ci/Makefile test
 
-  master-0:
-    name: master-0
+  next-0:
+    name: "next-0 (8.1)"
+    env:
+      PHP: "8.1"
+      enable_debug: "yes"
+      enable_zts: "yes"
+      PQ_DSN: "postgres:///runner"
+    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 \
+            libpq-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
+      - name: Build
+        run: |
+          make -f scripts/ci/Makefile ext PECL=pq
+      - name: Prepare Test
+        run: |
+          sudo systemctl start postgresql
+          sudo -u postgres createuser --login runner
+          sudo -u postgres createdb -O runner runner
+      - name: Test
+        run: |
+          make -f scripts/ci/Makefile test
+
+  next-1:
+    name: "next-1 (master)"
     continue-on-error: true
     env:
       PHP: "master"
@@ -224,7 +259,7 @@ 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: "8.0"
       enable_debug: "yes"
@@ -259,7 +294,7 @@ 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: "8.0"
       enable_debug: "no"
@@ -294,7 +329,7 @@ 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: "8.0"
       enable_debug: "yes"
@@ -329,7 +364,7 @@ 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: "8.0"
       enable_debug: "no"
@@ -364,7 +399,7 @@ 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"
diff --git a/scripts/gen_github_workflow_ci.php b/scripts/gen_github_workflow_ci.php
index 4b95237..7c2e009 100755
--- a/scripts/gen_github_workflow_ci.php
+++ b/scripts/gen_github_workflow_ci.php
@@ -18,17 +18,17 @@ $job = $gen->github([
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
 	"enable_json" => "yes",
-], 
-"master" => [
-    "PHP" => ["master"],
+],
+"next" => [
+    "PHP" => ["8.1", "master"],
     "enable_debug" => "yes",
     "enable_zts" => "yes",
-], 
+],
 "cur-dbg-zts" => [
     "PHP" => $cur,
     "enable_debug",
     "enable_zts",
-], 
+],
 "cur-cov" => [
     "CFLAGS" => "-O0 -g --coverage",
     "CXXFLAGS" => "-O0 -g --coverage",
@@ -36,7 +36,7 @@ $job = $gen->github([
 ]]);
 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");
     }
-- 
2.30.2