diff options
| author |  Zach Hilman | 2020-04-04 16:13:57 -0400 |
|---|---|---|
| committer | Zach Hilman | 2020-04-04 16:13:57 -0400 |
| commit | 59e75f4372deb8bbdab8dd40ff78006b7cce6a10 (patch) | |
| tree | 01cba324ee2bf0c9ab190d0916a8e7ed56f24de2 | |
| parent | Merge pull request #3579 from Kewlan/reorder-shoulder (diff) | |
| download | yuzu-59e75f4372deb8bbdab8dd40ff78006b7cce6a10.tar.gz yuzu-59e75f4372deb8bbdab8dd40ff78006b7cce6a10.tar.xz yuzu-59e75f4372deb8bbdab8dd40ff78006b7cce6a10.zip | |
ci: Update to Windows Server 2019 and Visual Studio 2019
This updates to the latest available toolchain for MSVC builds.
| -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 52cebaee0..adcecf0ec 100644 --- a/.ci/templates/build-msvc.yml +++ b/.ci/templates/build-msvc.yml | |||
| @@ -4,7 +4,7 @@ parameters: | |||
| 4 | version: '' | 4 | version: '' |
| 5 | 5 | ||
| 6 | steps: | 6 | steps: |
| 7 | - script: mkdir build && cd build && cmake -G "Visual Studio 15 2017 Win64" --config Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_BUNDLED_UNICORN=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cd .. | 7 | - script: mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 --config Release -DYUZU_USE_BUNDLED_QT=1 -DYUZU_USE_BUNDLED_SDL2=1 -DYUZU_USE_BUNDLED_UNICORN=1 -DYUZU_USE_QT_WEB_ENGINE=ON -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON -DYUZU_ENABLE_COMPATIBILITY_REPORTING=${COMPAT} -DUSE_DISCORD_PRESENCE=ON -DDISPLAY_VERSION=${{ parameters['version'] }} .. && cd .. |
| 8 | displayName: 'Configure CMake' | 8 | displayName: 'Configure CMake' |
| 9 | - task: MSBuild@1 | 9 | - task: MSBuild@1 |
| 10 | displayName: 'Build' | 10 | displayName: 'Build' |
diff --git a/.ci/yuzu-mainline-step2.yml b/.ci/yuzu-mainline-step2.yml index 5f2dfb3d8..a90041d28 100644 --- a/.ci/yuzu-mainline-step2.yml +++ b/.ci/yuzu-mainline-step2.yml | |||
| @@ -45,7 +45,7 @@ stages: | |||
| 45 | - job: build | 45 | - job: build |
| 46 | displayName: 'msvc' | 46 | displayName: 'msvc' |
| 47 | pool: | 47 | pool: |
| 48 | vmImage: vs2017-win2016 | 48 | vmImage: windows-2019 |
| 49 | steps: | 49 | steps: |
| 50 | - template: ./templates/sync-source.yml | 50 | - template: ./templates/sync-source.yml |
| 51 | parameters: | 51 | parameters: |
diff --git a/.ci/yuzu-patreon-step2.yml b/.ci/yuzu-patreon-step2.yml index 1b36f63e1..26e287257 100644 --- a/.ci/yuzu-patreon-step2.yml +++ b/.ci/yuzu-patreon-step2.yml | |||
| @@ -22,7 +22,7 @@ stages: | |||
| 22 | - job: build | 22 | - job: build |
| 23 | displayName: 'windows-msvc' | 23 | displayName: 'windows-msvc' |
| 24 | pool: | 24 | pool: |
| 25 | vmImage: vs2017-win2016 | 25 | vmImage: windows-2019 |
| 26 | steps: | 26 | steps: |
| 27 | - template: ./templates/sync-source.yml | 27 | - template: ./templates/sync-source.yml |
| 28 | parameters: | 28 | parameters: |