summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2022-08-30 20:28:33 +0200
committerMorph <39850852+Morph1984@users.noreply.github.com>2022-08-30 20:33:26 +0200
commit118503f6e5fd4f0c17d89df57600ab17c9b42d52 (patch)
tree54ae07ad8f5396e5ea83a7fe9f8a7a5becb61187
parentMerge pull request #8566 from german77/galaxy (diff)
downloadyuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.tar
yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.tar.gz
yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.tar.bz2
yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.tar.lz
yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.tar.xz
yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.tar.zst
yuzu-118503f6e5fd4f0c17d89df57600ab17c9b42d52.zip
-rw-r--r--.ci/templates/build-msvc.yml2
-rw-r--r--.ci/yuzu-mainline-step2.yml2
-rw-r--r--.ci/yuzu-patreon-step2.yml2
-rw-r--r--.github/workflows/verify.yml2
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:
steps:
- script: choco 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'
- task: MSBuild@1
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:
timeoutInMinutes: 120
displayName: 'msvc'
pool:
- vmImage: windows-2019
+ vmImage: windows-2022
steps:
- template: ./templates/sync-source.yml
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:
timeoutInMinutes: 120
displayName: 'windows-msvc'
pool:
- vmImage: windows-2019
+ vmImage: windows-2022
steps:
- template: ./templates/sync-source.yml
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:
build-msvc:
name: 'test build (windows, msvc)'
needs: format
- runs-on: windows-2019
+ runs-on: windows-2022
steps:
- name: Set up cache
uses: actions/cache@v3