Преглед изворни кода

Merge pull request #8833 from Morph1984/vs2022-again

ci: Enable building with Visual Studio 2022 (again)
Mai пре 3 година
родитељ
комит
b1a18355fb

+ 1 - 1
.ci/templates/build-msvc.yml

@@ -9,7 +9,7 @@ parameters:
 steps:
 steps:
 - script: choco install vulkan-sdk
 - script: choco install vulkan-sdk
   displayName: 'Install vulkan-sdk'
   displayName: 'Install vulkan-sdk'
-- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release .. && cd ..
+- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 17 2022" -A x64 -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DYUZU_TESTS=OFF -DUSE_DISCORD_PRESENCE=ON -DENABLE_QT_TRANSLATION=ON -DDISPLAY_VERSION=${{ parameters['version'] }} -DCMAKE_BUILD_TYPE=Release .. && cd ..
   displayName: 'Configure CMake'
   displayName: 'Configure CMake'
 - task: MSBuild@1
 - task: MSBuild@1
   displayName: 'Build'
   displayName: 'Build'

+ 1 - 1
.ci/yuzu-mainline-step2.yml

@@ -50,7 +50,7 @@ stages:
     timeoutInMinutes: 120
     timeoutInMinutes: 120
     displayName: 'msvc'
     displayName: 'msvc'
     pool:
     pool:
-      vmImage: windows-2019
+      vmImage: windows-2022
     steps:
     steps:
     - template: ./templates/sync-source.yml
     - template: ./templates/sync-source.yml
       parameters:
       parameters:

+ 1 - 1
.ci/yuzu-patreon-step2.yml

@@ -15,7 +15,7 @@ stages:
     timeoutInMinutes: 120
     timeoutInMinutes: 120
     displayName: 'windows-msvc'
     displayName: 'windows-msvc'
     pool:
     pool:
-      vmImage: windows-2019
+      vmImage: windows-2022
     steps:
     steps:
     - template: ./templates/sync-source.yml
     - template: ./templates/sync-source.yml
       parameters:
       parameters:

+ 1 - 1
.github/workflows/verify.yml

@@ -71,7 +71,7 @@ jobs:
   build-msvc:
   build-msvc:
     name: 'test build (windows, msvc)'
     name: 'test build (windows, msvc)'
     needs: format
     needs: format
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
     steps:
       - name: Set up cache
       - name: Set up cache
         uses: actions/cache@v3
         uses: actions/cache@v3