Merge of #17636

Author: mergify[bot]

.github/workflows/ci.yml

@@ -45,7 +45,7 @@ jobs:
   test:
     strategy:
       matrix:
-        os: ['macos-latest', 'ubuntu-latest', 'windows-latest']
+        os: ['macos-latest', 'ubuntu-latest', 'windows-2025']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

.mergify.yml

@@ -3,7 +3,7 @@ queue_rules:
     merge_method: squash
     conditions:
       - check-success=test (macos-latest)
-      - check-success=test (windows-latest)
+      - check-success=test (windows-2025)
       - check-success=system-test
       - check-success=lint
       - check-success=CLA