Merge pull request #8833 from Morph1984/vs2022-again

ci: Enable building with Visual Studio 2022 (again)
This commit is contained in:
Mai 2022-09-03 15:46:49 -04:00 committed by GitHub
commit b1a18355fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -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'

View file

@ -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:

View file

@ -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:

View file

@ -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