Merge pull request #8256 from Morph1984/ci-vs-2022

ci: Enable building with Visual Studio 2022
This commit is contained in:
bunnei 2022-04-25 11:04:52 -07:00 committed by GitHub
commit 67569dfe9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions

View file

@ -8,7 +8,7 @@ steps:
displayName: 'Install vulkan-sdk' displayName: 'Install vulkan-sdk'
- script: python -m pip install --upgrade pip conan - script: python -m pip install --upgrade pip conan
displayName: 'Install conan' displayName: 'Install conan'
- 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'

View file

@ -47,7 +47,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:

View file

@ -12,7 +12,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: