ci: use gha to get windows vcpkg working #15921
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| diff --git a/cmake/opentracing-cpp.cmake b/cmake/opentracing-cpp.cmake | ||
| index f014ecd..fd8898a 100644 | ||
| --- a/cmake/opentracing-cpp.cmake | ||
| +++ b/cmake/opentracing-cpp.cmake | ||
| @@ -1,7 +1,11 @@ | ||
| # Copyright The OpenTelemetry Authors | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| -find_package(OpenTracing CONFIG QUIET) | ||
| +find_package(OpenTracing CONFIG REQUIRED) | ||
| +if(NOT TARGET OpenTracing::opentracing AND TARGET OpenTracing::opentracing-static) | ||
| + add_library(OpenTracing::opentracing ALIAS OpenTracing::opentracing-static) | ||
| +endif() | ||
| + | ||
| set(OpenTracing_PROVIDER "find_package") | ||
|
|
||
| if(NOT OpenTracing_FOUND) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,130 +1,98 @@ | ||
| if(VCPKG_TARGET_IS_WINDOWS) | ||
| vcpkg_check_linkage(ONLY_STATIC_LIBRARY) | ||
| endif() | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO open-telemetry/opentelemetry-cpp | ||
| REF "v${VERSION}" | ||
| SHA512 6dc0357d8b3410852d3f970f72b8bec59dba9d6c533ca600432102e65de161903bd9170d98cef7ff0af5191309577ffd2a69ccd004b840914a910a6a282204e4 | ||
| HEAD_REF main | ||
| PATCHES | ||
| fix-target_link.patch | ||
| ) | ||
|
|
||
| vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS | ||
| FEATURES | ||
| etw WITH_ETW | ||
| zipkin WITH_ZIPKIN | ||
| prometheus WITH_PROMETHEUS | ||
| elasticsearch WITH_ELASTICSEARCH | ||
| otlp-file WITH_OTLP_FILE | ||
| otlp-http WITH_OTLP_HTTP | ||
| otlp-grpc WITH_OTLP_GRPC | ||
| geneva WITH_GENEVA | ||
| user-events WITH_USER_EVENTS | ||
| opentracing WITH_OPENTRACING | ||
| INVERTED_FEATURES | ||
| user-events BUILD_TRACEPOINTS | ||
| ) | ||
|
|
||
| # opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. | ||
| if(WITH_OTLP_FILE OR WITH_OTLP_GRPC OR WITH_OTLP_HTTP) | ||
| set(OTEL_PROTO_VERSION "1.6.0") | ||
| vcpkg_download_distfile(ARCHIVE | ||
| URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" | ||
| FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" | ||
| SHA512 0e72e0c32d2d699d7a832a4c57a9dbe60e844d4c4e8d7b39eb45e4282cde89fccfeef893eae70b9d018643782090a7228c3ef60863b00747498e80f0cf1db8ae | ||
| ) | ||
|
|
||
| vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}") | ||
| file(REMOVE_RECURSE "${SOURCE_PATH}/third_party/opentelemetry-proto") | ||
| file(COPY "${src}/." DESTINATION "${SOURCE_PATH}/third_party/opentelemetry-proto") | ||
| # Create empty .git directory to prevent opentelemetry from cloning it during build time | ||
| file(MAKE_DIRECTORY "${SOURCE_PATH}/third_party/opentelemetry-proto/.git") | ||
| list(APPEND FEATURE_OPTIONS "-DgRPC_CPP_PLUGIN_EXECUTABLE=${CURRENT_HOST_INSTALLED_DIR}/tools/grpc/grpc_cpp_plugin${VCPKG_HOST_EXECUTABLE_SUFFIX}") | ||
| endif() | ||
| list(APPEND FEATURE_OPTIONS -DCMAKE_CXX_STANDARD=17 -DWITH_STL=CXX17) | ||
|
|
||
| set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "OFF") | ||
|
|
||
| if(WITH_GENEVA OR WITH_USER_EVENTS) | ||
| # Geneva and user events exporters from opentelemetry-cpp-contrib are tightly coupled with opentelemetry-cpp repo, | ||
| # so they should be ported as a feature under opentelemetry-cpp. | ||
| clone_opentelemetry_cpp_contrib(CONTRIB_SOURCE_PATH) | ||
|
|
||
| if(WITH_GENEVA) | ||
| set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${CONTRIB_SOURCE_PATH}/exporters/geneva") | ||
| if(VCPKG_TARGET_IS_WINDOWS) | ||
| set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}\;${CONTRIB_SOURCE_PATH}/exporters/geneva-trace") | ||
| else() | ||
| set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}\;${CONTRIB_SOURCE_PATH}/exporters/fluentd") | ||
| endif() | ||
| endif() | ||
|
|
||
| if(WITH_USER_EVENTS) | ||
| if(WITH_GENEVA) | ||
| set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}\;${CONTRIB_SOURCE_PATH}/exporters/user_events") | ||
| else() | ||
| set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${CONTRIB_SOURCE_PATH}/exporters/user_events") | ||
| endif() | ||
| endif() | ||
| endif() | ||
|
|
||
| vcpkg_cmake_configure( | ||
| SOURCE_PATH "${SOURCE_PATH}" | ||
| OPTIONS | ||
| -DBUILD_TESTING=OFF | ||
| -DWITH_EXAMPLES=OFF | ||
| -DOPENTELEMETRY_INSTALL=ON | ||
| -DWITH_BENCHMARK=OFF | ||
| -DCMAKE_CXX_STANDARD=17 | ||
| -DWITH_STL=CXX17 | ||
|
There was a problem hiding this comment. These CMake options are redundant as they are already appended to |
||
| -DOPENTELEMETRY_EXTERNAL_COMPONENT_PATH=${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS} | ||
| ${FEATURE_OPTIONS} | ||
| MAYBE_UNUSED_VARIABLES | ||
| WITH_GENEVA | ||
| WITH_USER_EVENTS | ||
| BUILD_TRACEPOINTS | ||
| gRPC_CPP_PLUGIN_EXECUTABLE | ||
| ) | ||
|
|
||
| vcpkg_cmake_install() | ||
| vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") | ||
| vcpkg_copy_pdbs() | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") | ||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The backslashes in this path are not escaped. When this line is interpreted by a shell like bash, the backslashes will act as escape characters and will be removed, resulting in a malformed path (
cighabuildsvcpkg-overlays).If backslashes are necessary for Windows, they must be escaped:
args+=("-DVCPKG_OVERLAY_PORTS=ci\\gha\\builds\\vcpkg-overlays")However, CMake on Windows generally handles forward slashes correctly, which is more portable. It's recommended to use forward slashes unless there's a specific reason
vcpkgrequires backslashes here.