From 71043b837ac82485bc89cc91fc4cc1104ffc2fa0 Mon Sep 17 00:00:00 2001 From: nihui Date: Sun, 30 Nov 2025 17:23:32 +0800 Subject: [PATCH 1/9] Update Windows runner version to 2025 --- .github/workflows/windows-mingw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-mingw.yml b/.github/workflows/windows-mingw.yml index fbc5fab461de..d7c3be23dbb6 100644 --- a/.github/workflows/windows-mingw.yml +++ b/.github/workflows/windows-mingw.yml @@ -31,7 +31,7 @@ permissions: jobs: windows: name: MinGW-w64 - runs-on: windows-2022 + runs-on: windows-2025 env: UseMultiToolTask: true From 52104eb56a216cba892ac8c05e35e64e2bdbc203 Mon Sep 17 00:00:00 2001 From: nihui Date: Sun, 30 Nov 2025 17:24:04 +0800 Subject: [PATCH 2/9] Update Windows runner version to 2025 --- .github/workflows/windows-clang.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-clang.yml b/.github/workflows/windows-clang.yml index 080a0e4ebf06..d1234cab52ee 100644 --- a/.github/workflows/windows-clang.yml +++ b/.github/workflows/windows-clang.yml @@ -33,7 +33,7 @@ permissions: jobs: windows: name: ClangCL - runs-on: windows-2022 + runs-on: windows-2025 env: UseMultiToolTask: true From 5c9552c2e26373150760f7056b01a3d240aeef0e Mon Sep 17 00:00:00 2001 From: nihui Date: Sun, 30 Nov 2025 17:25:28 +0800 Subject: [PATCH 3/9] Update Windows runner version to 2025 --- .github/workflows/windows-arm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-arm.yml b/.github/workflows/windows-arm.yml index 665100d8497b..17a2af94e679 100644 --- a/.github/workflows/windows-arm.yml +++ b/.github/workflows/windows-arm.yml @@ -31,7 +31,7 @@ permissions: jobs: windows: name: ${{ matrix.vs-version }} - runs-on: windows-2022 + runs-on: windows-2025 strategy: matrix: include: From 9238b5e2f28aa7d3ff0f3ed3e4140737020d46c6 Mon Sep 17 00:00:00 2001 From: nihui Date: Sun, 30 Nov 2025 17:25:44 +0800 Subject: [PATCH 4/9] Update windows.yml --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f7824cda4da7..c3ee2f60eba2 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -37,7 +37,7 @@ permissions: jobs: msvc: name: ${{ matrix.vs-version }} - runs-on: windows-2022 + runs-on: windows-2025 strategy: matrix: include: From 49cc1f61f18a58ebb4a00648432efd7383ceb5d1 Mon Sep 17 00:00:00 2001 From: nihui Date: Sun, 30 Nov 2025 19:57:34 +0800 Subject: [PATCH 5/9] Replace Windows SDK setup action --- .github/workflows/windows-arm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-arm.yml b/.github/workflows/windows-arm.yml index 17a2af94e679..72ed4d8b78a8 100644 --- a/.github/workflows/windows-arm.yml +++ b/.github/workflows/windows-arm.yml @@ -51,9 +51,9 @@ jobs: - uses: actions/checkout@v6 with: submodules: true - - uses: GuillaumeFalourd/setup-windows10-sdk-action@v2.4 + - uses: fbactions/setup-winsdk@v2 with: - sdk-version: ${{ matrix.windows-sdk-version }} + winsdk-build-version: ${{ matrix.windows-sdk-version }} - name: arm64 run: | mkdir build-arm64; cd build-arm64 From 8bc64cc7ff835b823526bc77a48991678f173164 Mon Sep 17 00:00:00 2001 From: nihui Date: Sun, 30 Nov 2025 19:58:06 +0800 Subject: [PATCH 6/9] Update Windows SDK setup action in workflow --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c3ee2f60eba2..39da4bab5edb 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -82,9 +82,9 @@ jobs: echo "INCLUDE=$($lines[1])" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "LIB=$($lines[2])" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - - uses: GuillaumeFalourd/setup-windows10-sdk-action@v2.4 + - uses: fbactions/setup-winsdk@v2 with: - sdk-version: ${{ matrix.windows-sdk-version }} + winsdk-build-version: ${{ matrix.windows-sdk-version }} - name: cache-protobuf id: cache-protobuf From b471a59aa5690e6c4b1dffd4e9f4f5cc2e85a0dd Mon Sep 17 00:00:00 2001 From: nihui Date: Sun, 30 Nov 2025 20:22:03 +0800 Subject: [PATCH 7/9] Update cache keys in Windows workflow --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 39da4bab5edb..86117b0bd35c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -91,7 +91,7 @@ jobs: uses: actions/cache@v4 with: path: "protobuf-install" - key: protobuf-${{ matrix.vs-version }}-x64-install-3 + key: protobuf-${{ matrix.vs-version }}-x64-install-4 - name: protobuf if: steps.cache-protobuf.outputs.cache-hit != 'true' run: | @@ -108,7 +108,7 @@ jobs: uses: actions/cache@v4 with: path: swiftshader-install - key: swiftshader-${{ matrix.vs-version }}-x64-install-20251010 + key: swiftshader-${{ matrix.vs-version }}-x64-install-20251130 - name: checkout-swiftshader if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' && steps.cache-swiftshader.outputs.cache-hit != 'true' uses: actions/checkout@v6 From 6a449be786159c45944ebf7346eb102a2b3b91c1 Mon Sep 17 00:00:00 2001 From: nihui Date: Mon, 1 Dec 2025 20:12:29 +0800 Subject: [PATCH 8/9] Update cache key and swiftshader reference --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 86117b0bd35c..a1cbf8c1b02b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -108,14 +108,14 @@ jobs: uses: actions/cache@v4 with: path: swiftshader-install - key: swiftshader-${{ matrix.vs-version }}-x64-install-20251130 + key: swiftshader-${{ matrix.vs-version }}-x64-install-20251201 - name: checkout-swiftshader if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' && steps.cache-swiftshader.outputs.cache-hit != 'true' uses: actions/checkout@v6 with: repository: google/swiftshader path: swiftshader - ref: de870ac7518fe2b6bb651ecc22fc36647cf7b986 + ref: 498a6f760dea6cdda0302406c49b8fbb09b9af92 - name: checkout-swiftshader-submodules if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' && steps.cache-swiftshader.outputs.cache-hit != 'true' run: | From d16bf411aaf67569135b4dbaecd6731ea308e235 Mon Sep 17 00:00:00 2001 From: nihui Date: Wed, 3 Dec 2025 10:21:20 +0800 Subject: [PATCH 9/9] Update SwiftShader reference in Windows workflow --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a1cbf8c1b02b..6501aac1801c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -115,7 +115,7 @@ jobs: with: repository: google/swiftshader path: swiftshader - ref: 498a6f760dea6cdda0302406c49b8fbb09b9af92 + ref: 518a9f63228dceb1c77d778f694bd319909075ab - name: checkout-swiftshader-submodules if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' && steps.cache-swiftshader.outputs.cache-hit != 'true' run: |