diff options
| author | 2022-08-30 14:28:33 -0400 | |
|---|---|---|
| committer | 2022-08-30 14:33:26 -0400 | |
| commit | 118503f6e5fd4f0c17d89df57600ab17c9b42d52 (patch) | |
| tree | 54ae07ad8f5396e5ea83a7fe9f8a7a5becb61187 | |
| parent | Merge pull request #8566 from german77/galaxy (diff) | |
| download | yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.tar.gz yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.tar.xz yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.zip | |
ci: Enable building with Visual Studio 2022 (again)
Since the following https://developercommunity.visualstudio.com/t/Type-alias-lookup-failure-within-paramet/10039150 compiler bug has been fixed, we can finally build with VS 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: | |||
| 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 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 .. | 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 .. && 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 0e99f43fa..b294827f4 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-2019 | 53 | vmImage: windows-2022 |
| 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 33c081c53..5d5b140fd 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-2019 | 18 | vmImage: windows-2022 |
| 19 | steps: | 19 | steps: |
| 20 | - template: ./templates/sync-source.yml | 20 | - template: ./templates/sync-source.yml |
| 21 | parameters: | 21 | 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: | |||
| 71 | build-msvc: | 71 | build-msvc: |
| 72 | name: 'test build (windows, msvc)' | 72 | name: 'test build (windows, msvc)' |
| 73 | needs: format | 73 | needs: format |
| 74 | runs-on: windows-2019 | 74 | runs-on: windows-2022 |
| 75 | steps: | 75 | steps: |
| 76 | - name: Set up cache | 76 | - name: Set up cache |
| 77 | uses: actions/cache@v3 | 77 | uses: actions/cache@v3 |