From 3a020fa9c6f3d81da1d4a0cbd2656c2437c8e2a4 Mon Sep 17 00:00:00 2001
From: Mateusz <matt.wozakowski@gmail.com>
Date: Mon, 4 Aug 2025 17:31:41 +0100
Subject: [PATCH 1/2] Update windows runner to 2022

---
 .github/workflows/tests.yml    | 2 +-
 .github/workflows/versions.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d73648ee..3530bc51 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -782,7 +782,7 @@ jobs:
 
   build_windows_vs16:
     needs: source
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/versions.yml b/.github/workflows/versions.yml
index 626c97ce..854d48e1 100644
--- a/.github/workflows/versions.yml
+++ b/.github/workflows/versions.yml
@@ -297,7 +297,7 @@ jobs:
 
   build_windows:
     needs: source_abi
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
@@ -341,7 +341,7 @@ jobs:
           echo call configure.bat --disable-all --enable-cli --disable-zts --enable-couchbase >> task.bat
           echo nmake >> task.bat
           dir
-          call c:\php\php-sdk\phpsdk-vs16-x64.bat -t task.bat
+          call c:\php\php-sdk\phpsdk-vs17-x64.bat -t task.bat
           dir
           if defined CB_ABI_VERSION (
            echo Renaming so file to php_couchbase_%CB_ABI_VERSION%.dll
@@ -382,7 +382,7 @@ jobs:
     needs:
       - source_abi
       - build_windows
-    runs-on: windows-2019
+    runs-on: windows-2022
     strategy:
       fail-fast: false
     steps:

From 5759ec6341c773d6d219561181e9f7f6c48fa3dd Mon Sep 17 00:00:00 2001
From: Sergey Avseyev <sergey.avseyev@gmail.com>
Date: Mon, 4 Aug 2025 15:04:23 -0700
Subject: [PATCH 2/2] try to install 2019 tools

---
 .github/workflows/tests.yml | 42 +++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3530bc51..39aa4823 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -800,6 +800,48 @@ jobs:
           - default
           - locked
     steps:
+      - name: Download Visual Studio 2019 Enterprise bootstrapper
+        shell: powershell
+        run: |
+          Invoke-WebRequest -Uri "https://aka.ms/vs/16/release/vs_Enterprise.exe" -OutFile "vs_Enterprise.exe"
+          Get-Item .\vs_Enterprise.exe | Select-Object Name,Length
+
+      - name: Remove previous offline layout folder if exists
+        shell: powershell
+        run: |
+          if (Test-Path .\vs_2019_offline) { Remove-Item -Recurse -Force .\vs_2019_offline }
+
+      - name: Create offline layout for Visual Studio 2019 Enterprise with logging
+        shell: powershell
+        run: |
+          .\vs_Enterprise.exe --layout .\vs_2019_offline --lang en-US --log layout.log
+          if (Test-Path .\layout.log) {
+            Get-Content .\layout.log -Tail 50
+          } else {
+            Write-Output "layout.log was not created."
+          }
+
+      - name: Verify offline layout folder contents
+        shell: powershell
+        run: |
+          if (Test-Path .\vs_2019_offline) {
+            Get-ChildItem -Recurse .\vs_2019_offline | Select-Object FullName,Length | Format-Table -AutoSize
+          } else {
+            Write-Output "Layout folder not created"
+            exit 1
+          }
+
+      - name: Install Visual Studio 2019 from offline layout silently
+        shell: powershell
+        run: |
+          .\vs_Enterprise.exe --quiet --wait --norestart --noUpdateInstaller --noWeb --allWorkloads --includeRecommended --includeOptional --layout .\vs_2019_offline
+
+      - name: List Visual Studio installations with vswhere
+        shell: powershell
+        run: |
+          $vswhere = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
+          & $vswhere -all -products * -prerelease -format text
+
       - name: Install dependencies
         shell: cmd
         run: |