Use windows-2022 for 8.4

dixyes · Nov 26, 2024 · bc8025d · bc8025d
1 parent fe53bbb
commit bc8025d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 7 deletions.
diff --git a/.github/workflows/master-tests.yml b/.github/workflows/master-tests.yml
@@ -170,7 +170,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['windows-2019']
+        os: ['windows-2022']
         ts: [ 'nts', 'ts' ]
       max-parallel: 2
     steps:

diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -19,13 +19,23 @@ jobs:
   builddlls:
     # this name is used after, change it with cautious
     name: Build dll for PHP-${{ matrix.php-version }}-${{ matrix.arch }}-${{ (matrix.ts == '0') && 'N' || '' }}TS-VS16
-    runs-on: windows-2019
+    runs-on: ${{ matrix.image }}
     strategy:
       fail-fast: false
       matrix:
-        php-version: ["8.4", "8.3", "8.2", "8.1", "8.0"]
+        php-version: ["8.3", "8.2", "8.1", "8.0"]
         arch: ["x64"]
         ts: ["0", "1"]
+        image: [ "windows-2019" ]
+        include:
+          - php-version: "8.4"
+            arch: "x64"
+            ts: "0"
+            image: "windows-2022"
+          - php-version: "8.4"
+            arch: "x64"
+            ts: "1"
+            image: "windows-2022"
       max-parallel: 8
     outputs:
       ref: ${{ steps.getref.outputs.ref }}

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -271,13 +271,24 @@ jobs:
           verbose: true
 
   windows-tests:
-    name: PHP ${{ matrix.php-version }} ${{ matrix.ts }} Test on windows-2019
-    runs-on: windows-2019
+    name: PHP ${{ matrix.php-version }} ${{ matrix.ts }} Test on ${{ matrix.image }}
+    runs-on: ${{ matrix.image }}
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.4', "8.3", "8.2", "8.1", "8.0"]
-        ts: [ 'nts', 'ts' ]
+        php-version: ["8.3", "8.2", "8.1", "8.0"]
+        arch: ["x64"]
+        ts: ["0", "1"]
+        image: [ "windows-2019" ]
+        include:
+          - php-version: "8.4"
+            arch: "x64"
+            ts: "0"
+            image: "windows-2022"
+          - php-version: "8.4"
+            arch: "x64"
+            ts: "1"
+            image: "windows-2022"
       max-parallel: 8
     steps:
       - name: Checkout