diff --git a/.github/workflows/windows-arm.yml b/.github/workflows/windows-arm.yml index 665100d8497b..72ed4d8b78a8 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: @@ -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 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 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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0d95448683b9..e0b326abd1f9 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: @@ -82,16 +82,16 @@ 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 uses: actions/cache@v5 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,14 +108,14 @@ jobs: uses: actions/cache@v5 with: path: swiftshader-install - key: swiftshader-${{ matrix.vs-version }}-x64-install-20251010 + 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: 518a9f63228dceb1c77d778f694bd319909075ab - name: checkout-swiftshader-submodules if: matrix.vs-version != 'vs2015' && matrix.vs-version != 'vs2017' && steps.cache-swiftshader.outputs.cache-hit != 'true' run: |