diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2020-06-10 22:13:25 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2020-06-10 23:28:54 +0100 |
| commit | 8b8b69a785d0a6527ba1c56185df1e7beddc6227 (patch) | |
| tree | ec93e28ec8f188758b2692aa2b97dc8a4f2e13ef | |
| parent | 96a5f38f51bc53895000787542f92d0a3352c026 (diff) | |
| download | libgit2-8b8b69a785d0a6527ba1c56185df1e7beddc6227.tar.gz | |
azure pipelines: use bundled zlib
Azure Pipelines has a version of zlib hanging out on the filesystem;
avoid trying to use it as it's either 64 _or_ 32 bit, so exactly one of
our builds will fail.
| -rw-r--r-- | azure-pipelines.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 20335b33a..28fbc1613 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -96,7 +96,7 @@ jobs: parameters: environmentVariables: CMAKE_GENERATOR: Visual Studio 15 2017 - CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON + CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON SKIP_SSH_TESTS: true SKIP_NEGOTIATE_TESTS: true @@ -109,7 +109,7 @@ jobs: parameters: environmentVariables: CMAKE_GENERATOR: Visual Studio 15 2017 - CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS + CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON SKIP_SSH_TESTS: true SKIP_NEGOTIATE_TESTS: true |