From 691b94684535f6fde8629fa9361ecb885a0fc735 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 28 May 2026 14:20:39 +0100
Subject: [PATCH 1/3] Windows, LLVM: Update LLVM MinGW toolchain

---
 .github/workflows/windows-llvm-arm64.yml  | 4 ++--
 .github/workflows/windows-llvm-x86_64.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/windows-llvm-arm64.yml b/.github/workflows/windows-llvm-arm64.yml
index 6e144977..14ce1c39 100644
--- a/.github/workflows/windows-llvm-arm64.yml
+++ b/.github/workflows/windows-llvm-arm64.yml
@@ -20,8 +20,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CI_LLVM_MINGW_URL: https://github.com/mstorsjo/llvm-mingw/releases/download/20260505/llvm-mingw-20260505-ucrt-ubuntu-22.04-x86_64.tar.xz
-  CI_LLVM_MINGW_HASH: 986d7beef2f6d7e2f3939a1d04ac8746d614e7014557961e7e0d381d7bc5fdcd
+  CI_LLVM_MINGW_URL: https://github.com/mstorsjo/llvm-mingw/releases/download/20260519/llvm-mingw-20260519-ucrt-ubuntu-22.04-x86_64.tar.xz
+  CI_LLVM_MINGW_HASH: a48f8c2801508272ccde64d87a26747ecc5306623d9a080a42ed80dc61f79fa2
   CI_HOST: aarch64-w64-mingw32
 
 jobs:
diff --git a/.github/workflows/windows-llvm-x86_64.yml b/.github/workflows/windows-llvm-x86_64.yml
index 050eef90..0c2edc06 100644
--- a/.github/workflows/windows-llvm-x86_64.yml
+++ b/.github/workflows/windows-llvm-x86_64.yml
@@ -20,8 +20,8 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  CI_LLVM_MINGW_URL: https://github.com/mstorsjo/llvm-mingw/releases/download/20260505/llvm-mingw-20260505-ucrt-ubuntu-22.04-x86_64.tar.xz
-  CI_LLVM_MINGW_HASH: 986d7beef2f6d7e2f3939a1d04ac8746d614e7014557961e7e0d381d7bc5fdcd
+  CI_LLVM_MINGW_URL: https://github.com/mstorsjo/llvm-mingw/releases/download/20260519/llvm-mingw-20260519-ucrt-ubuntu-22.04-x86_64.tar.xz
+  CI_LLVM_MINGW_HASH: a48f8c2801508272ccde64d87a26747ecc5306623d9a080a42ed80dc61f79fa2
   CI_HOST: x86_64-w64-mingw32
 
 jobs:

From 94c4c63adec691aae672df7189bcecd62d50923c Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 28 May 2026 14:21:41 +0100
Subject: [PATCH 2/3] Windows, LLVM: Drop no longer needed `-Wno-error=*`

---
 .github/workflows/windows-llvm-arm64.yml  | 2 +-
 .github/workflows/windows-llvm-x86_64.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/windows-llvm-arm64.yml b/.github/workflows/windows-llvm-arm64.yml
index 14ce1c39..11896b29 100644
--- a/.github/workflows/windows-llvm-arm64.yml
+++ b/.github/workflows/windows-llvm-arm64.yml
@@ -55,7 +55,7 @@ jobs:
             -DBUILD_BENCH=ON \
             -DBUILD_FUZZ_BINARY=ON \
             -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
-            -DAPPEND_CXXFLAGS="-Wno-error=deprecated-declarations -Wno-error=unused-member-function -Wno-error=unused-private-field"
+            -DAPPEND_CXXFLAGS="-Wno-error=deprecated-declarations"
 
       - name: Build
         run: cmake --build build -j $(nproc)
diff --git a/.github/workflows/windows-llvm-x86_64.yml b/.github/workflows/windows-llvm-x86_64.yml
index 0c2edc06..e8f5616a 100644
--- a/.github/workflows/windows-llvm-x86_64.yml
+++ b/.github/workflows/windows-llvm-x86_64.yml
@@ -55,7 +55,7 @@ jobs:
             -DBUILD_BENCH=ON \
             -DBUILD_FUZZ_BINARY=ON \
             -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \
-            -DAPPEND_CXXFLAGS="-Wno-error=deprecated-declarations -Wno-error=unused-member-function -Wno-error=unused-private-field"
+            -DAPPEND_CXXFLAGS="-Wno-error=deprecated-declarations"
 
       - name: Build
         run: cmake --build build -j $(nproc)

From 691d52135f40ca34cbd9a5212f485cf8208eb3d2 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 28 May 2026 14:27:13 +0100
Subject: [PATCH 3/3] Windows, LLVM: Drop outdated `msvc-dev-cmd` action

---
 .github/workflows/windows-llvm-arm64.yml  | 12 +++++-------
 .github/workflows/windows-llvm-x86_64.yml | 14 ++++++--------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/windows-llvm-arm64.yml b/.github/workflows/windows-llvm-arm64.yml
index 11896b29..606a121d 100644
--- a/.github/workflows/windows-llvm-arm64.yml
+++ b/.github/workflows/windows-llvm-arm64.yml
@@ -88,15 +88,13 @@ jobs:
         with:
           name: ${{ env.CI_HOST }}-executables-${{ github.run_id }}
 
-      - name: Configure Developer Command Prompt for Microsoft Visual C++
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: arm64
-
       - name: Check 'bitcoind.exe' executable
+        # https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-180#developer_command_file_locations
+        shell: cmd
         run: |
-          dumpbin.exe /imports bin\bitcoind.exe | Select-String -Pattern "\S+\.dll" -CaseSensitive:$false
-          bin\bitcoind.exe -version
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=arm64 -host_arch=arm64 -no_logo
+          pwsh.exe -Command "dumpbin.exe /imports bin\bitcoind.exe | Select-String -Pattern '\S+\.dll' -CaseSensitive:$false" || exit 1
+          bin\bitcoind.exe -version || exit 1
 
       - name: Run unit tests
         run: |
diff --git a/.github/workflows/windows-llvm-x86_64.yml b/.github/workflows/windows-llvm-x86_64.yml
index e8f5616a..3daf6244 100644
--- a/.github/workflows/windows-llvm-x86_64.yml
+++ b/.github/workflows/windows-llvm-x86_64.yml
@@ -71,7 +71,7 @@ jobs:
 
   windows-x86_64-native-test:
     name: 'Windows x86-64, test cross-built executables natively'
-    runs-on: windows-latest
+    runs-on: windows-2025-vs2026
     needs: windows-x86_64-cross
     defaults:
       run:
@@ -88,15 +88,13 @@ jobs:
         with:
           name: ${{ env.CI_HOST }}-executables-${{ github.run_id }}
 
-      - name: Configure Developer Command Prompt for Microsoft Visual C++
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x64
-
       - name: Check 'bitcoind.exe' executable
+        # https://learn.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-180#developer_command_file_locations
+        shell: cmd
         run: |
-          dumpbin.exe /imports bin\bitcoind.exe | Select-String -Pattern "\S+\.dll" -CaseSensitive:$false
-          bin\bitcoind.exe -version
+          call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64 -no_logo
+          pwsh.exe -Command "dumpbin.exe /imports bin\bitcoind.exe | Select-String -Pattern '\S+\.dll' -CaseSensitive:$false" || exit 1
+          bin\bitcoind.exe -version || exit 1
 
       - name: Run unit tests
         run: |