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

---
 .github/workflows/ci.yml           | 99 +++---------------------------
 scripts/gen_github_workflow_ci.php |  4 +-
 2 files changed, 11 insertions(+), 92 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d962fc8..756e3fd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
   old-matrix-1:
     name: old-matrix-1
     env:
-      PHP: "7.0"
+      PHP: "7.4"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
     runs-on: ubuntu-20.04
@@ -64,7 +64,7 @@ jobs:
   old-matrix-2:
     name: old-matrix-2
     env:
-      PHP: "7.1"
+      PHP: "8.0"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
     runs-on: ubuntu-20.04
@@ -91,7 +91,7 @@ jobs:
   old-matrix-3:
     name: old-matrix-3
     env:
-      PHP: "7.2"
+      PHP: "8.1"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
     runs-on: ubuntu-20.04
@@ -118,88 +118,7 @@ jobs:
   old-matrix-4:
     name: old-matrix-4
     env:
-      PHP: "7.3"
-      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-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: |
-          make -f scripts/ci/Makefile ext PECL=apfd
-      - name: Test
-        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"
+      PHP: "8.2"
       enable_debug: "yes"
       enable_maintainer_zts: "yes"
     runs-on: ubuntu-20.04
@@ -254,7 +173,7 @@ jobs:
   cur-dbg-zts-0:
     name: cur-dbg-zts-0
     env:
-      PHP: "8.2"
+      PHP: "8.3"
       enable_debug: "yes"
       enable_zts: "yes"
     runs-on: ubuntu-20.04
@@ -281,7 +200,7 @@ jobs:
   cur-dbg-zts-1:
     name: cur-dbg-zts-1
     env:
-      PHP: "8.2"
+      PHP: "8.3"
       enable_debug: "no"
       enable_zts: "yes"
     runs-on: ubuntu-20.04
@@ -308,7 +227,7 @@ jobs:
   cur-dbg-zts-2:
     name: cur-dbg-zts-2
     env:
-      PHP: "8.2"
+      PHP: "8.3"
       enable_debug: "yes"
       enable_zts: "no"
     runs-on: ubuntu-20.04
@@ -335,7 +254,7 @@ jobs:
   cur-dbg-zts-3:
     name: cur-dbg-zts-3
     env:
-      PHP: "8.2"
+      PHP: "8.3"
       enable_debug: "no"
       enable_zts: "no"
     runs-on: ubuntu-20.04
@@ -364,7 +283,7 @@ jobs:
     env:
       CFLAGS: "-O0 -g --coverage"
       CXXFLAGS: "-O0 -g --coverage"
-      PHP: "8.2"
+      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 1212e0f..e23ea9d 100755
--- a/scripts/gen_github_workflow_ci.php
+++ b/scripts/gen_github_workflow_ci.php
@@ -10,11 +10,11 @@ on:
 jobs:
 <?php
 
-$cur = "8.2";
+$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", "8.0", "8.1"],
+	"PHP" => ["5.6", "7.4", "8.0", "8.1", "8.2"],
 	"enable_debug" => "yes",
 	"enable_maintainer_zts" => "yes",
 ],
-- 
2.30.2