Skip to content

Commit 61b1699

Browse files
authored
Enable Brotli in CI. (#912)
* Enable Brotli in CI.
1 parent a072579 commit 61b1699

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

Release/src/http/common/http_compression.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ class brotli_compressor : public compress_provider
383383
try
384384
{
385385
r.output_bytes_produced =
386-
compress(input, input_size, output, output_size, hint, r.input_bytes_processed, &r.done);
386+
compress(input, input_size, output, output_size, hint, r.input_bytes_processed, r.done);
387387
}
388388
catch (...)
389389
{
@@ -509,7 +509,7 @@ class brotli_decompressor : public decompress_provider
509509
try
510510
{
511511
r.output_bytes_produced =
512-
decompress(input, input_size, output, output_size, hint, r.input_bytes_processed, &r.done);
512+
decompress(input, input_size, output, output_size, hint, r.input_bytes_processed, r.done);
513513
}
514514
catch (...)
515515
{

azure-pipelines.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ jobs:
77
steps:
88
- script: .\vcpkg\bootstrap-vcpkg.bat
99
displayName: Bootstrap vcpkg
10-
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp
10+
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli
1111
displayName: vcpkg install dependencies
1212
- script: mkdir build.common
1313
displayName: Make Build Directory
1414
- task: CMake@1
1515
inputs:
1616
workingDirectory: 'build.common'
17-
cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
17+
cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..'
1818
- task: MSBuild@1
1919
inputs:
2020
solution: 'build.common/ALL_BUILD.vcxproj'
@@ -38,14 +38,14 @@ jobs:
3838
steps:
3939
- script: .\vcpkg\bootstrap-vcpkg.bat
4040
displayName: Bootstrap vcpkg
41-
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp --triplet x64-windows
41+
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows
4242
displayName: vcpkg install dependencies
4343
- script: mkdir build.common
4444
displayName: Make Build Directory
4545
- task: CMake@1
4646
inputs:
4747
workingDirectory: 'build.common'
48-
cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
48+
cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..'
4949
- task: MSBuild@1
5050
inputs:
5151
solution: 'build.common/ALL_BUILD.vcxproj'
@@ -71,14 +71,14 @@ jobs:
7171
steps:
7272
- script: .\vcpkg\bootstrap-vcpkg.bat
7373
displayName: Bootstrap vcpkg
74-
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp
74+
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli
7575
displayName: vcpkg install dependencies
7676
- script: mkdir build.common
7777
displayName: Make Build Directory
7878
- task: CMake@1
7979
inputs:
8080
workingDirectory: 'build.common'
81-
cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
81+
cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..'
8282
- task: MSBuild@1
8383
inputs:
8484
solution: 'build.common/ALL_BUILD.vcxproj'
@@ -102,14 +102,14 @@ jobs:
102102
steps:
103103
- script: .\vcpkg\bootstrap-vcpkg.bat
104104
displayName: Bootstrap vcpkg
105-
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp --triplet x64-windows
105+
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows
106106
displayName: vcpkg install dependencies
107107
- script: mkdir build.common
108108
displayName: Make Build Directory
109109
- task: CMake@1
110110
inputs:
111111
workingDirectory: 'build.common'
112-
cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
112+
cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..'
113113
- task: MSBuild@1
114114
inputs:
115115
solution: 'build.common/ALL_BUILD.vcxproj'
@@ -136,7 +136,7 @@ jobs:
136136
- script: |
137137
sudo apt-get install -y ppa-purge
138138
sudo ppa-purge -y ppa:ondrej/php
139-
sudo apt-get install -y libboost-atomic-dev libboost-thread-dev libboost-system-dev libboost-date-time-dev libboost-regex-dev libboost-filesystem-dev libboost-random-dev libboost-chrono-dev libboost-serialization-dev libwebsocketpp-dev brotli openssl libssl-dev ninja-build
139+
sudo apt-get install -y libboost-atomic-dev libboost-thread-dev libboost-system-dev libboost-date-time-dev libboost-regex-dev libboost-filesystem-dev libboost-random-dev libboost-chrono-dev libboost-serialization-dev libwebsocketpp-dev openssl libssl-dev ninja-build
140140
displayName: Apt install dependencies
141141
- script: |
142142
mkdir build.debug
@@ -199,6 +199,7 @@ jobs:
199199
- script: |
200200
mkdir build.debug
201201
mkdir build.release
202+
mkdir build.release.static
202203
displayName: Make Build Directories
203204
- task: CMake@1
204205
inputs:
@@ -208,6 +209,10 @@ jobs:
208209
inputs:
209210
workingDirectory: 'build.release'
210211
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
212+
- task: CMake@1
213+
inputs:
214+
workingDirectory: 'build.release.static'
215+
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..'
211216
- script: |
212217
cd build.debug
213218
ninja
@@ -224,3 +229,7 @@ jobs:
224229
cd build.release/Release/Binaries
225230
./test_runner *test.dylib
226231
displayName: 'Run tests, release'
232+
- script: |
233+
cd build.release.static
234+
ninja
235+
displayName: 'Run ninja, release static'

0 commit comments

Comments
 (0)