summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2020-11-22 20:27:16 -0800
committerGravatar GitHub2020-11-22 20:27:16 -0800
commit2b05c32343c67ec74fbae6dff056a7a96b8cf9b1 (patch)
treec81965945ec024bfc8ee63094e417bf5bbbdcf6b
parentMerge pull request #4944 from lioncash/system-rem (diff)
parentCI: move refreshenv to the configure step... (diff)
downloadyuzu-2b05c32343c67ec74fbae6dff056a7a96b8cf9b1.tar.gz
yuzu-2b05c32343c67ec74fbae6dff056a7a96b8cf9b1.tar.xz
yuzu-2b05c32343c67ec74fbae6dff056a7a96b8cf9b1.zip
Merge pull request #4969 from liushuyu/master
CI: move refreshenv to the configure step
Diffstat (limited to '')
-rw-r--r--.ci/templates/build-msvc.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.ci/templates/build-msvc.yml b/.ci/templates/build-msvc.yml
index 2eefc8768..0b4bbd341 100644
--- a/.ci/templates/build-msvc.yml
+++ b/.ci/templates/build-msvc.yml
@@ -4,11 +4,11 @@ parameters:
4 version: '' 4 version: ''
5 5
6steps: 6steps:
7- script: choco install vulkan-sdk && refreshenv 7- script: choco install vulkan-sdk
8 displayName: 'Install vulkan-sdk' 8 displayName: 'Install vulkan-sdk'
9- script: python -m pip install --upgrade pip conan 9- script: python -m pip install --upgrade pip conan
10 displayName: 'Install conan' 10 displayName: 'Install conan'
11- script: mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 --config Release -DYUZU_USE_BUNDLED_QT=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 .. 11- script: refreshenv && mkdir build && cd build && cmake -G "Visual Studio 16 2019" -A x64 --config Release -DYUZU_USE_BUNDLED_QT=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 ..
12 displayName: 'Configure CMake' 12 displayName: 'Configure CMake'
13- task: MSBuild@1 13- task: MSBuild@1
14 displayName: 'Build' 14 displayName: 'Build'