-
Notifications
You must be signed in to change notification settings - Fork 441
ci: use gha to get windows vcpkg working #15921
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.
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
Open
scotthart
wants to merge
26
commits into
prepare-for-v3.0.0
Choose a base branch
from
ci-gha-v3-windows-2
base: prepare-for-v3.0.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+22,201
−71
Open
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
16878a8
wip
scotthart 6669a2d
windows cmake bigtable
scotthart ea7ccfd
fix if
scotthart 919c03a
update otel overlay portfile
scotthart a11072d
more overlay updates
scotthart 8da5343
cmake args std17
scotthart daa758a
debug build
scotthart cbcf3dc
disable sccache
scotthart 03a67ee
debug overlay
scotthart 9ee5e0f
fix patch file
scotthart dc1a8ec
path update
scotthart 6682b10
copy over patch file
scotthart 00ac151
NOMINMAX
scotthart 4a3d66c
cleanup
scotthart d3e642f
latest vcpkg release
scotthart af1e1ba
use vcpkg HEAD
scotthart 1b21ff1
undef GetObject
scotthart 1c7ff68
undef GetObject in cc
scotthart ef30f72
reorder undef
scotthart b556d44
more undef
scotthart a786a48
use grpc port files
scotthart cd7391f
add grpc port includes to grpc stub files
scotthart b4b3ecd
generator emits grpc ports def
scotthart 2773238
grpc ports def mock
scotthart 7d6bc89
grpc ports def some tests
scotthart e587ef9
more updates
scotthart File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
The diff you're trying to view is too large. We only load the first 3000 changed files.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 2025.10.17 | ||
| 3895230f38e498525f2560a281223d12066fa74a |
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
17 changes: 17 additions & 0 deletions
17
ci/gha/builds/vcpkg-overlays/opentelemetry-cpp/fix-target_link.patch
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
108 changes: 108 additions & 0 deletions
108
ci/gha/builds/vcpkg-overlays/opentelemetry-cpp/vcpkg.json
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,108 @@ | ||
| { | ||
| "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", | ||
| "name": "opentelemetry-cpp", | ||
| "version-semver": "1.23.0", | ||
| "description": [ | ||
| "OpenTelemetry is a collection of tools, APIs, and SDKs.", | ||
| "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior." | ||
| ], | ||
| "homepage": "https://github.com/open-telemetry/opentelemetry-cpp", | ||
| "license": "Apache-2.0", | ||
| "dependencies": [ | ||
| "abseil", | ||
| "nlohmann-json", | ||
| { | ||
| "name": "vcpkg-cmake", | ||
| "host": true | ||
| }, | ||
| { | ||
| "name": "vcpkg-cmake-config", | ||
| "host": true | ||
| } | ||
| ], | ||
| "features": { | ||
| "elasticsearch": { | ||
| "description": "Whether to include the Elasticsearch Client in the SDK", | ||
| "dependencies": [ | ||
| { | ||
| "name": "curl", | ||
| "default-features": false | ||
| } | ||
| ] | ||
| }, | ||
| "etw": { | ||
| "description": "Whether to include the ETW Exporter in the SDK", | ||
| "supports": "windows" | ||
| }, | ||
| "geneva": { | ||
| "description": "Whether to include the Geneva Exporter from the opentelemetry-cpp-contrib repository", | ||
| "dependencies": [ | ||
| { | ||
| "name": "opentelemetry-cpp", | ||
| "features": [ | ||
| "etw" | ||
| ], | ||
| "platform": "windows" | ||
| }, | ||
| "opentelemetry-cpp-contrib-version" | ||
| ] | ||
| }, | ||
| "opentracing": { | ||
| "description": "Whether to include the Opentracing shim", | ||
| "dependencies": [ | ||
| "opentracing" | ||
| ] | ||
| }, | ||
| "otlp-file": { | ||
| "description": "Whether to include the OpenTelemetry Protocol to File exporter in the SDK", | ||
| "supports": "!uwp", | ||
| "dependencies": [ | ||
| "protobuf" | ||
| ] | ||
| }, | ||
| "otlp-grpc": { | ||
| "description": "Whether to include the OTLP gRPC exporter in the SDK", | ||
| "dependencies": [ | ||
| "grpc", | ||
| { | ||
| "name": "grpc", | ||
| "host": true | ||
| } | ||
| ] | ||
| }, | ||
| "otlp-http": { | ||
| "description": "Whether to include the OpenTelemetry Protocol over HTTP in the SDK", | ||
| "dependencies": [ | ||
| "curl", | ||
| "protobuf" | ||
| ] | ||
| }, | ||
| "prometheus": { | ||
| "description": "Whether to include the Prometheus Client in the SDK", | ||
| "dependencies": [ | ||
| "prometheus-cpp" | ||
| ] | ||
| }, | ||
| "user-events": { | ||
| "description": "Whether to include the User Events Exporter from the opentelemetry-cpp-contrib repository", | ||
| "supports": "linux", | ||
| "dependencies": [ | ||
| "libeventheader-tracepoint", | ||
| "libtracepoint", | ||
| { | ||
| "name": "opentelemetry-cpp", | ||
| "features": [ | ||
| "otlp-http" | ||
| ] | ||
| }, | ||
| "opentelemetry-cpp-contrib-version" | ||
| ] | ||
| }, | ||
| "zipkin": { | ||
| "description": "Whether to include the Zipkin exporter in the SDK", | ||
| "dependencies": [ | ||
| "curl" | ||
| ] | ||
| } | ||
| } | ||
| } |
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
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.