Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable Brotli in CI. #912

Merged
merged 3 commits into from
Oct 12, 2018
Merged

Enable Brotli in CI. #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9808b58
Enable Brotli in CI.
BillyONeal Oct 12, 2018
93bf3d0
Repair build failures in the brotli module.
BillyONeal Oct 12, 2018
d175fae
Remove brotli for non-vcpkg.
BillyONeal Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Release/src/http/common/http_compression.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ class brotli_compressor : public compress_provider
try
{
r.output_bytes_produced =
compress(input, input_size, output, output_size, hint, r.input_bytes_processed, &r.done);
compress(input, input_size, output, output_size, hint, r.input_bytes_processed, r.done);
}
catch (...)
{
Expand Down Expand Up @@ -509,7 +509,7 @@ class brotli_decompressor : public decompress_provider
try
{
r.output_bytes_produced =
decompress(input, input_size, output, output_size, hint, r.input_bytes_processed, &r.done);
decompress(input, input_size, output, output_size, hint, r.input_bytes_processed, r.done);
}
catch (...)
{
Expand Down
27 changes: 18 additions & 9 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ jobs:
steps:
- script: .\vcpkg\bootstrap-vcpkg.bat
displayName: Bootstrap vcpkg
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli
displayName: vcpkg install dependencies
- script: mkdir build.common
displayName: Make Build Directory
- task: CMake@1
inputs:
workingDirectory: 'build.common'
cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..'
- task: MSBuild@1
inputs:
solution: 'build.common/ALL_BUILD.vcxproj'
Expand All @@ -38,14 +38,14 @@ jobs:
steps:
- script: .\vcpkg\bootstrap-vcpkg.bat
displayName: Bootstrap vcpkg
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp --triplet x64-windows
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows
displayName: vcpkg install dependencies
- script: mkdir build.common
displayName: Make Build Directory
- task: CMake@1
inputs:
workingDirectory: 'build.common'
cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..'
- task: MSBuild@1
inputs:
solution: 'build.common/ALL_BUILD.vcxproj'
Expand All @@ -71,14 +71,14 @@ jobs:
steps:
- script: .\vcpkg\bootstrap-vcpkg.bat
displayName: Bootstrap vcpkg
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli
displayName: vcpkg install dependencies
- script: mkdir build.common
displayName: Make Build Directory
- task: CMake@1
inputs:
workingDirectory: 'build.common'
cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
cmakeArgs: '-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..'
- task: MSBuild@1
inputs:
solution: 'build.common/ALL_BUILD.vcxproj'
Expand All @@ -102,14 +102,14 @@ jobs:
steps:
- script: .\vcpkg\bootstrap-vcpkg.bat
displayName: Bootstrap vcpkg
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp --triplet x64-windows
- script: .\vcpkg\vcpkg.exe install zlib openssl boost-system boost-date-time boost-regex boost-interprocess websocketpp brotli --triplet x64-windows
displayName: vcpkg install dependencies
- script: mkdir build.common
displayName: Make Build Directory
- task: CMake@1
inputs:
workingDirectory: 'build.common'
cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake ..'
cmakeArgs: '-A x64 -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake -DCPPREST_EXCLUDE_BROTLI=OFF ..'
- task: MSBuild@1
inputs:
solution: 'build.common/ALL_BUILD.vcxproj'
Expand All @@ -136,7 +136,7 @@ jobs:
- script: |
sudo apt-get install -y ppa-purge
sudo ppa-purge -y ppa:ondrej/php
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
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
displayName: Apt install dependencies
- script: |
mkdir build.debug
Expand Down Expand Up @@ -199,6 +199,7 @@ jobs:
- script: |
mkdir build.debug
mkdir build.release
mkdir build.release.static
displayName: Make Build Directories
- task: CMake@1
inputs:
Expand All @@ -208,6 +209,10 @@ jobs:
inputs:
workingDirectory: 'build.release'
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release ..'
- task: CMake@1
inputs:
workingDirectory: 'build.release.static'
cmakeArgs: '-G Ninja -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF ..'
- script: |
cd build.debug
ninja
Expand All @@ -224,3 +229,7 @@ jobs:
cd build.release/Release/Binaries
./test_runner *test.dylib
displayName: 'Run tests, release'
- script: |
cd build.release.static
ninja
displayName: 'Run ninja, release static'