Merge pull request #8349 from yuzu-emu/revert-8256-ci-vs-2022
Revert "ci: Enable building with Visual Studio 2022"
This commit is contained in:
commit
52dd68cfff
|
@ -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 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 -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_VCPKG=ON .. && cd ..
|
- 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 -DYUZU_TESTS=OFF -DYUZU_USE_BUNDLED_VCPKG=ON .. && cd ..
|
||||||
displayName: 'Configure CMake'
|
displayName: 'Configure CMake'
|
||||||
- task: MSBuild@1
|
- task: MSBuild@1
|
||||||
displayName: 'Build'
|
displayName: 'Build'
|
||||||
|
|
|
@ -50,7 +50,7 @@ stages:
|
||||||
timeoutInMinutes: 120
|
timeoutInMinutes: 120
|
||||||
displayName: 'msvc'
|
displayName: 'msvc'
|
||||||
pool:
|
pool:
|
||||||
vmImage: windows-2022
|
vmImage: windows-2019
|
||||||
steps:
|
steps:
|
||||||
- template: ./templates/sync-source.yml
|
- template: ./templates/sync-source.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
|
|
@ -15,7 +15,7 @@ stages:
|
||||||
timeoutInMinutes: 120
|
timeoutInMinutes: 120
|
||||||
displayName: 'windows-msvc'
|
displayName: 'windows-msvc'
|
||||||
pool:
|
pool:
|
||||||
vmImage: windows-2022
|
vmImage: windows-2019
|
||||||
steps:
|
steps:
|
||||||
- template: ./templates/sync-source.yml
|
- template: ./templates/sync-source.yml
|
||||||
parameters:
|
parameters:
|
||||||
|
|
Reference in New Issue