diff options
| author |  bunnei | 2022-07-28 12:50:07 -0700 |
|---|---|---|
| committer |  GitHub | 2022-07-28 12:50:07 -0700 |
| commit | 52dd68cfff8631d273669010d23428fa0217f1af (patch) | |
| tree | df602f370dd36f7c7dd74585d60ffeca7ca28d16 | |
| parent | Merge pull request #8659 from lat9nq/drpc-yuzu (diff) | |
| parent | Revert "ci: Enable building with Visual Studio 2022" (diff) | |
| download | yuzu-52dd68cfff8631d273669010d23428fa0217f1af.tar.gz yuzu-52dd68cfff8631d273669010d23428fa0217f1af.tar.xz yuzu-52dd68cfff8631d273669010d23428fa0217f1af.zip | |
Merge pull request #8349 from yuzu-emu/revert-8256-ci-vs-2022
Revert "ci: Enable building with Visual Studio 2022"
| -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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml index fe5cce563..dfb5862c3 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml | |||
| @@ -9,7 +9,7 @@ parameters: | |||
| 9 | steps: | 9 | steps: |
| 10 | - script: choco install vulkan-sdk | 10 | - script: choco install vulkan-sdk |
| 11 | displayName: 'Install vulkan-sdk' | 11 | displayName: 'Install vulkan-sdk' |
| 12 | - 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 .. | 12 | - 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 .. |
| 13 | displayName: 'Configure CMake' | 13 | displayName: 'Configure CMake' |
| 14 | - task: MSBuild@1 | 14 | - task: MSBuild@1 |
| 15 | displayName: 'Build' | 15 | displayName: 'Build' |
diff --git a/.ci/yuzu-mainline-step2.yml b/.ci/yuzu-mainline-step2.yml index b294827f4..0e99f43fa 100644 --- a/.ci/yuzu-mainline-step2.yml +++ b/.ci/yuzu-mainline-step2.yml | |||
| @@ -50,7 +50,7 @@ stages: | |||
| 50 | timeoutInMinutes: 120 | 50 | timeoutInMinutes: 120 |
| 51 | displayName: 'msvc' | 51 | displayName: 'msvc' |
| 52 | pool: | 52 | pool: |
| 53 | vmImage: windows-2022 | 53 | vmImage: windows-2019 |
| 54 | steps: | 54 | steps: |
| 55 | - template: ./templates/sync-source.yml | 55 | - template: ./templates/sync-source.yml |
| 56 | parameters: | 56 | parameters: |
diff --git a/.ci/yuzu-patreon-step2.yml b/.ci/yuzu-patreon-step2.yml index 5d5b140fd..33c081c53 100644 --- a/.ci/yuzu-patreon-step2.yml +++ b/.ci/yuzu-patreon-step2.yml | |||
| @@ -15,7 +15,7 @@ stages: | |||
| 15 | timeoutInMinutes: 120 | 15 | timeoutInMinutes: 120 |
| 16 | displayName: 'windows-msvc' | 16 | displayName: 'windows-msvc' |
| 17 | pool: | 17 | pool: |
| 18 | vmImage: windows-2022 | 18 | vmImage: windows-2019 |
| 19 | steps: | 19 | steps: |
| 20 | - template: ./templates/sync-source.yml | 20 | - template: ./templates/sync-source.yml |
| 21 | parameters: | 21 | parameters: |