summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2019-03-16 10:00:58 +0100
committerPatric Stout <truebrain@openttd.org>2019-03-16 12:43:25 +0100
commit7bd43f7413aed2dc544f0f9ec269c5693ef2c69f (patch)
treeafc96b872a907ada729cb5141723b8bbff3b8aba
parent1100418063c90783f2bdd6aedcf91229f5882a50 (diff)
downloadopenttd-7bd43f7413aed2dc544f0f9ec269c5693ef2c69f.tar.xz
Fix: [AzurePipelines] vcpkg is now preinstalled on Windows images
So instead of integrating our own, we only copy our precompiled binaries into the right folder.
-rw-r--r--azure-pipelines/templates/windows-dependencies.yml10
1 files changed, 7 insertions, 3 deletions
diff --git a/azure-pipelines/templates/windows-dependencies.yml b/azure-pipelines/templates/windows-dependencies.yml
index c6fc6e407..72368b9d7 100644
--- a/azure-pipelines/templates/windows-dependencies.yml
+++ b/azure-pipelines/templates/windows-dependencies.yml
@@ -1,10 +1,14 @@
steps:
- bash: |
set -ex
+
curl -L https://github.com/OpenTTD/CompileFarm/releases/download/latest/windows-dependencies.zip > windows-dependencies.zip
unzip windows-dependencies.zip
rm -f windows-dependencies.zip
- displayName: 'Download dependencies'
- workingDirectory: $(Build.ArtifactStagingDirectory)
-- script: $(Build.ArtifactStagingDirectory)\windows-dependencies\vcpkg.exe integrate install
+
+ mv windows-dependencies/installed /c/vcpkg/
+ rm -rf windows-dependencies
displayName: 'Install dependencies'
+ workingDirectory: $(Build.ArtifactStagingDirectory)
+- script: c:\vcpkg\vcpkg.exe integrate install
+ displayName: 'Integrate vcpkg'