From 01bdc5eaee06a8fa77b8611968ef552f71af6583 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Mon, 22 Jul 2024 11:55:09 +0200
Subject: [PATCH 1/2] Update CI workflow

We

* update action/checkout to v4
* upgrade cmb69/setup-php-sdk to php/setup-php-sdk
* add PHP 8.1 to 8.3 to the Windows matrix
* run on windows-2019 for now
---
 .github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c6de5e2..94ecff3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Install re2c
         run: sudo apt-get install -y re2c
       - name: Checkout mailparse
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
@@ -35,18 +35,18 @@ jobs:
         shell: cmd
     strategy:
       matrix:
-          version: ["7.4", "8.0"]
+          version: ["7.4", "8.0", "8.1", "8.2", "8.3"]
           arch: [x64, x86]
           ts: [ts]
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - name: Configure Git
         run: git config --global core.autocrlf false
       - name: Checkout mailparse
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Setup PHP
         id: setup-php
-        uses: cmb69/setup-php-sdk@v0.2
+        uses: php/setup-php-sdk@v0.8
         with:
           version: ${{matrix.version}}
           arch: ${{matrix.arch}}

From c81c857e321a72621e29a0310279fe5f64ddf553 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Mon, 22 Jul 2024 13:58:22 +0200
Subject: [PATCH 2/2] Try to successfully run tests on PHP >= 8.2.0

---
 .github/workflows/ci.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 94ecff3..974ebaf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,8 +35,8 @@ jobs:
         shell: cmd
     strategy:
       matrix:
-          version: ["7.4", "8.0", "8.1", "8.2", "8.3"]
-          arch: [x64, x86]
+          version: ["8.2", "8.3"]
+          arch: [x64]
           ts: [ts]
     runs-on: windows-2019
     steps:
@@ -59,8 +59,18 @@ jobs:
       - name: phpize
         run: phpize
       - name: configure
-        run: configure --enable-mailparse --with-prefix=${{steps.setup-php.outputs.prefix}}
+        run: configure --enable-test-ini --enable-mailparse --with-prefix=${{steps.setup-php.outputs.prefix}}
       - name: make
         run: nmake
+      - name: patch test ini
+        run: |
+          if "${{matrix.arch}}"=="x64" (
+            set my_ini_file=x64\Release_TS\tmp-php.ini
+          ) else (
+            set my_ini_file=Release_TS\tmp-php.ini
+          )
+          set mbstring=${{steps.setup-php.outputs.prefix}}\ext\php_mbstring.dll
+          sed -i "1s/^/extension=%mbstring:\=\\\%\n/" %my_ini_file%
+          type %my_ini_file%
       - name: test
-        run: nmake test TESTS="-d extension=${{steps.setup-php.outputs.prefix}}\ext\php_mbstring.dll --show-diff tests"
+        run: nmake test TESTS="--show-diff tests"