From e20a54c08ab98a0ddff2c7807120bd5a3284666a Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 25 Sep 2024 20:45:49 +0200
Subject: [PATCH] ci: update PHP versions

---
 .github/workflows/ci.yml           | 46 ++++++------------------------
 scripts/gen_github_workflow_ci.php |  6 ++--
 2 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14aff16..e5f8ace 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
   old-matrix-1:
     name: old-matrix-1
     env:
-      PHP: "7.0"
+      PHP: "7.4"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
@@ -66,7 +66,7 @@ jobs:
   old-matrix-2:
     name: old-matrix-2
     env:
-      PHP: "7.1"
+      PHP: "8.0"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
@@ -94,7 +94,7 @@ jobs:
   old-matrix-3:
     name: old-matrix-3
     env:
-      PHP: "7.2"
+      PHP: "8.1"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
@@ -122,35 +122,7 @@ jobs:
   old-matrix-4:
     name: old-matrix-4
     env:
-      PHP: "7.3"
-      enable_debug: "yes"
-      enable_maintainer_zts: "yes"
-      enable_json: "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=json_post
-      - name: Test
-        run: |
-          make -f scripts/ci/Makefile test
-
-  old-matrix-5:
-    name: old-matrix-5
-    env:
-      PHP: "7.4"
+      PHP: "8.2"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
       enable_json: "yes"
@@ -206,7 +178,7 @@ jobs:
   cur-dbg-zts-0:
     name: cur-dbg-zts-0
     env:
-      PHP: "8.0"
+      PHP: "8.3"
       enable_debug: "yes"
       enable_zts: "yes"
     runs-on: ubuntu-20.04
@@ -233,7 +205,7 @@ jobs:
   cur-dbg-zts-1:
     name: cur-dbg-zts-1
     env:
-      PHP: "8.0"
+      PHP: "8.3"
       enable_debug: "no"
       enable_zts: "yes"
     runs-on: ubuntu-20.04
@@ -260,7 +232,7 @@ jobs:
   cur-dbg-zts-2:
     name: cur-dbg-zts-2
     env:
-      PHP: "8.0"
+      PHP: "8.3"
       enable_debug: "yes"
       enable_zts: "no"
     runs-on: ubuntu-20.04
@@ -287,7 +259,7 @@ jobs:
   cur-dbg-zts-3:
     name: cur-dbg-zts-3
     env:
-      PHP: "8.0"
+      PHP: "8.3"
       enable_debug: "no"
       enable_zts: "no"
     runs-on: ubuntu-20.04
@@ -316,7 +288,7 @@ jobs:
     env:
       CFLAGS: "-O0 -g --coverage"
       CXXFLAGS: "-O0 -g --coverage"
-      PHP: "8.0"
+      PHP: "8.3"
     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 dd068db..d4b3363 100755
--- a/scripts/gen_github_workflow_ci.php
+++ b/scripts/gen_github_workflow_ci.php
@@ -10,15 +10,15 @@ on:
 jobs:
 <?php
 
-$cur = "8.0";
+$cur = "8.3";
 $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.4", "8.0", "8.1", "8.2"],
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
 	"enable_json" => "yes",
-], 
+],
 "master" => [
 	"PHP" => "master",
 	"enable_debug" => "yes",
-- 
2.30.2