diff options
| author | Mai <mathew1800@gmail.com> | 2022-09-03 15:46:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-03 15:46:49 -0400 |
| commit | b1a18355fb0eef2ebc4f248a71156c67bf797f33 (patch) | |
| tree | 5484040689cf43b730884d853e4ac767aed50f06 | |
| parent | 3bcfd0dc427c513079ab1e563c555f1242537e65 (diff) | |
| parent | 118503f6e5fd4f0c17d89df57600ab17c9b42d52 (diff) | |
Merge pull request #8833 from Morph1984/vs2022-again
ci: Enable building with Visual Studio 2022 (again)
| -rw-r--r-- | .ci/templates/build-msvc.yml | 2 | ||||
| -rw-r--r-- | .ci/yuzu-mainline-step2.yml | 2 | ||||
| -rw-r--r-- | .ci/yuzu-patreon-step2.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/verify.yml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml index 2a1bf93bc..a2ee71bd8 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml @@ -9,7 +9,7 @@ parameters: steps: - script: choco 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' - task: MSBuild@1 displayName: 'Build' diff --git a/.ci/yuzu-mainline-step2.yml b/.ci/yuzu-mainline-step2.yml index 0e99f43fa..b294827f4 100644 --- a/.ci/yuzu-mainline-step2.yml +++ b/.ci/yuzu-mainline-step2.yml @@ -50,7 +50,7 @@ stages: timeoutInMinutes: 120 displayName: 'msvc' pool: - vmImage: windows-2019 + vmImage: windows-2022 steps: - template: ./templates/sync-source.yml parameters: diff --git a/.ci/yuzu-patreon-step2.yml b/.ci/yuzu-patreon-step2.yml index 33c081c53..5d5b140fd 100644 --- a/.ci/yuzu-patreon-step2.yml +++ b/.ci/yuzu-patreon-step2.yml @@ -15,7 +15,7 @@ stages: timeoutInMinutes: 120 displayName: 'windows-msvc' pool: - vmImage: windows-2019 + vmImage: windows-2022 steps: - template: ./templates/sync-source.yml parameters: diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 9a973ee0c..733a52764 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -71,7 +71,7 @@ jobs: build-msvc: name: 'test build (windows, msvc)' needs: format - runs-on: windows-2019 + runs-on: windows-2022 steps: - name: Set up cache uses: actions/cache@v3 |