Skip to content

Commit 8b8b69a

Browse files
committed
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.
1 parent 96a5f38 commit 8b8b69a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
parameters:
9797
environmentVariables:
9898
CMAKE_GENERATOR: Visual Studio 15 2017
99-
CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
99+
CMAKE_OPTIONS: -A x64 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON
100100
SKIP_SSH_TESTS: true
101101
SKIP_NEGOTIATE_TESTS: true
102102

@@ -109,7 +109,7 @@ jobs:
109109
parameters:
110110
environmentVariables:
111111
CMAKE_GENERATOR: Visual Studio 15 2017
112-
CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
112+
CMAKE_OPTIONS: -A Win32 -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS -DUSE_BUNDLED_ZLIB=ON
113113
SKIP_SSH_TESTS: true
114114
SKIP_NEGOTIATE_TESTS: true
115115

0 commit comments

Comments
 (0)