瀏覽代碼

ci: Update Windows CI runners

spencer-lunarg 2 月之前
父節點
當前提交
e52ecf72c6
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 2 2
      .github/workflows/continuous_deployment.yml
  2. 4 4
      .github/workflows/continuous_integration.yml

+ 2 - 2
.github/workflows/continuous_deployment.yml

@@ -147,7 +147,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                os: [{genus: windows-2019, family: windows}]
+                os: [{genus: windows-2022, family: windows}]
                 cmake_build_type: [Debug, Release]
         steps:
             - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -155,7 +155,7 @@ jobs:
             - run: python update_glslang_sources.py
             - name: Build
               run: |
-                  cmake -S. -Bbuild -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install"
+                  cmake -S. -Bbuild -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install"
                   cmake --build build --config ${{matrix.cmake_build_type}} --target install
             - name: Test
               run: |

+ 4 - 4
.github/workflows/continuous_integration.yml

@@ -206,7 +206,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          os: [{genus: windows-2019, family: windows}]
+          os: [{genus: windows-2022, family: windows}]
           cmake_build_type: [Debug, Release]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -214,7 +214,7 @@ jobs:
       - run: python update_glslang_sources.py
       - name: Build
         run: |
-          cmake -S. -Bbuild -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install" -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON
+          cmake -S. -Bbuild -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install" -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON
           cmake --build build --config ${{matrix.cmake_build_type}} --target install
       - name: Test find_package support
         run: |
@@ -230,7 +230,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-          os: [{genus: windows-2019, family: windows}]
+          os: [{genus: windows-2022, family: windows}]
           cmake_build_type: [Debug, Release]
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -238,7 +238,7 @@ jobs:
       - run: python update_glslang_sources.py
       - name: Build
         run: |
-          cmake -S. -Bbuild -G "Visual Studio 16 2019" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install" -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON -DBUILD_SHARED_LIBS=ON
+          cmake -S. -Bbuild -G "Visual Studio 17 2022" -A x64 -DCMAKE_INSTALL_PREFIX="$PWD/build/install" -DBUILD_WERROR=ON -D GLSLANG_TESTS=ON -DBUILD_SHARED_LIBS=ON
           cmake --build build --config ${{matrix.cmake_build_type}} --target install
       - name: Test find_package support
         run: |