[ci] Change Windows runner to 2022

See if this helps with #6395. Update the sccache key to use the full runner name and not rely on the OS. The runner may be totally different and having cache hits by OS doesn't make sense. Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
llvm · Nov 9, 2023 · 32ee6c9 · 32ee6c9
1 parent 1b5674b
commit 32ee6c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/buildAndTestWindows.yml b/.github/workflows/buildAndTestWindows.yml
@@ -14,7 +14,7 @@ jobs:
     name: Build and Test
     uses: ./.github/workflows/unifiedBuildTestAndInstall.yml
     with:
-      runner: windows-2019
+      runner: windows-2022
       cmake_build_type: release
       llvm_enable_assertions: ON
       build_shared_libs: OFF

diff --git a/.github/workflows/unifiedBuildTestAndInstall.yml b/.github/workflows/unifiedBuildTestAndInstall.yml
@@ -160,7 +160,7 @@ jobs:
         if: runner.os != 'Windows' || inputs.cmake_build_type == 'release'
         uses: hendrikmuhs/ccache-action@v1.2
         with:
-          key: ${{ runner.os }}-${{ inputs.cmake_c_compiler }}-${{ inputs.cmake_cxx_compiler }}-${{ inputs.cmake_build_type }}-${{ inputs.build_shared_libs }}-${{ inputs.llvm_enable_assertions }}-${{ inputs.llvm_force_enable_stats}}
+          key: ${{ inputs.runner }}-${{ inputs.cmake_c_compiler }}-${{ inputs.cmake_cxx_compiler }}-${{ inputs.cmake_build_type }}-${{ inputs.build_shared_libs }}-${{ inputs.llvm_enable_assertions }}-${{ inputs.llvm_force_enable_stats}}
           max-size: 500M
           variant: sccache
       - name: Configure sccache