From 0978f3e431e0c931e3861b09f9a9e0ac9d589c0e Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Thu, 12 Oct 2023 09:40:17 +0200
Subject: [PATCH] ci: update PHP versions

---
 .github/workflows/ci.yml           | 64 +++++++++++++++++++++++++++---
 scripts/gen_github_workflow_ci.php |  6 +--
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2ed0b9c..d962fc8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -169,6 +169,60 @@ jobs:
         run: |
           make -f scripts/ci/Makefile test
 
+  old-matrix-6:
+    name: old-matrix-6
+    env:
+      PHP: "8.0"
+      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: |
+          make -f scripts/ci/Makefile ext PECL=apfd
+      - name: Test
+        run: |
+          make -f scripts/ci/Makefile test
+
+  old-matrix-7:
+    name: old-matrix-7
+    env:
+      PHP: "8.1"
+      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: |
+          make -f scripts/ci/Makefile ext PECL=apfd
+      - name: Test
+        run: |
+          make -f scripts/ci/Makefile test
+
   master-0:
     name: master-0
     continue-on-error: true
@@ -200,7 +254,7 @@ jobs:
   cur-dbg-zts-0:
     name: cur-dbg-zts-0
     env:
-      PHP: "8.0"
+      PHP: "8.2"
       enable_debug: "yes"
       enable_zts: "yes"
     runs-on: ubuntu-20.04
@@ -227,7 +281,7 @@ jobs:
   cur-dbg-zts-1:
     name: cur-dbg-zts-1
     env:
-      PHP: "8.0"
+      PHP: "8.2"
       enable_debug: "no"
       enable_zts: "yes"
     runs-on: ubuntu-20.04
@@ -254,7 +308,7 @@ jobs:
   cur-dbg-zts-2:
     name: cur-dbg-zts-2
     env:
-      PHP: "8.0"
+      PHP: "8.2"
       enable_debug: "yes"
       enable_zts: "no"
     runs-on: ubuntu-20.04
@@ -281,7 +335,7 @@ jobs:
   cur-dbg-zts-3:
     name: cur-dbg-zts-3
     env:
-      PHP: "8.0"
+      PHP: "8.2"
       enable_debug: "no"
       enable_zts: "no"
     runs-on: ubuntu-20.04
@@ -310,7 +364,7 @@ jobs:
     env:
       CFLAGS: "-O0 -g --coverage"
       CXXFLAGS: "-O0 -g --coverage"
-      PHP: "8.0"
+      PHP: "8.2"
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
diff --git a/scripts/gen_github_workflow_ci.php b/scripts/gen_github_workflow_ci.php
index fd99ee3..1212e0f 100755
--- a/scripts/gen_github_workflow_ci.php
+++ b/scripts/gen_github_workflow_ci.php
@@ -10,14 +10,14 @@ on:
 jobs:
 <?php
 
-$cur = "8.0";
+$cur = "8.2";
 $gen = include __DIR__ . "/ci/gen-matrix.php";
 $job = $gen->github([
 "old-matrix" => [
-	"PHP" => ["5.6", "7.0", "7.1", "7.2", "7.3", "7.4"],
+	"PHP" => ["5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1"],
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
-], 
+],
 "master" => [
 	"PHP" => "master",
 	"enable_debug" => "yes",
-- 
2.30.2