Skip to content

Commit feb6a68

Browse files
committed
Install deps with vcpkg
1 parent edb8937 commit feb6a68

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

ci/do_ci.ps1

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ if (!(test-path plugin)) {
2525
}
2626
$PLUGIN_DIR = Join-Path "$SRC_DIR" "plugin"
2727

28-
$VCPKG_DIR = Join-Path "$SRC_DIR" "tools" "vcpkg"
28+
$VCPKG_DIR = Join-Path "$SRC_DIR" "tools/vcpkg"
2929

3030
$Env:CTEST_OUTPUT_ON_FAILURE = "1"
3131

@@ -135,6 +135,9 @@ switch ($action) {
135135
"cmake.maintainer.test" {
136136
cd "$BUILD_DIR"
137137
cmake $SRC_DIR `
138+
-DWITH_OTLP_GRPC=ON `
139+
-DWITH_OTLP_HTTP=ON `
140+
-DWITH_OTLP_RETRY_PREVIEW=ON `
138141
-DOTELCPP_MAINTAINER_MODE=ON `
139142
-DWITH_NO_DEPRECATED_CODE=ON `
140143
-DVCPKG_TARGET_TRIPLET=x64-windows `
@@ -159,6 +162,9 @@ switch ($action) {
159162
cmake $SRC_DIR `
160163
-DWITH_STL=CXX20 `
161164
-DCMAKE_CXX_STANDARD=20 `
165+
-DWITH_OTLP_GRPC=ON `
166+
-DWITH_OTLP_HTTP=ON `
167+
-DWITH_OTLP_RETRY_PREVIEW=ON `
162168
-DOTELCPP_MAINTAINER_MODE=ON `
163169
-DWITH_NO_DEPRECATED_CODE=ON `
164170
-DVCPKG_TARGET_TRIPLET=x64-windows `
@@ -203,6 +209,9 @@ switch ($action) {
203209
cd "$BUILD_DIR"
204210
cmake $SRC_DIR `
205211
-DVCPKG_TARGET_TRIPLET=x64-windows `
212+
-DWITH_OTLP_GRPC=ON `
213+
-DWITH_OTLP_HTTP=ON `
214+
-DWITH_OTLP_RETRY_PREVIEW=ON `
206215
-DWITH_OTPROTCOL=ON `
207216
"-DCMAKE_TOOLCHAIN_FILE=$VCPKG_DIR/scripts/buildsystems/vcpkg.cmake"
208217
$exit = $LASTEXITCODE

ci/setup_windows_ci_environment.ps1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,10 @@ $VCPKG_DIR = (Get-Item -Path ".\").FullName
1919
# nlohmann-json
2020
./vcpkg "--vcpkg-root=$VCPKG_DIR" install nlohmann-json:x64-windows
2121

22+
# grpc
23+
./vcpkg "--vcpkg-root=$VCPKG_DIR" install grpc:x64-windows
24+
25+
# curl
26+
./vcpkg "--vcpkg-root=$VCPKG_DIR" install curl:x64-windows
27+
2228
Pop-Location

0 commit comments

Comments
 (0)