diff options
| author |  liushuyu | 2020-11-22 16:19:34 -0700 |
|---|---|---|
| committer | liushuyu | 2020-11-22 16:19:34 -0700 |
| commit | b546640c41d90b87d987cd74a123dfad85d1a065 (patch) | |
| tree | c81965945ec024bfc8ee63094e417bf5bbbdcf6b | |
| parent | Merge pull request #4944 from lioncash/system-rem (diff) | |
| download | yuzu-b546640c41d90b87d987cd74a123dfad85d1a065.tar.gz yuzu-b546640c41d90b87d987cd74a123dfad85d1a065.tar.xz yuzu-b546640c41d90b87d987cd74a123dfad85d1a065.zip | |
CI: move refreshenv to the configure step...
... so that cmake can find the Vulkan SDK binaries
| -rw-r--r-- | .ci/templates/build-msvc.yml | 4 |
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 | ||
| 6 | steps: | 6 | steps: |
| 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' |