Skip to content

Commit bb9632c

Browse files
committed
updated to latest protobuf
1 parent 872d2f4 commit bb9632c

File tree

5 files changed

+2957
-41
lines changed

5 files changed

+2957
-41
lines changed

.bazelrc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,3 +137,10 @@ build:clang-cl --host_per_file_copt="c-ares\\+/.*@-Wno-macro-redefined"
137137
build:clang-cl --copt=-Wno-missing-template-arg-list-after-template-kw
138138

139139
build --incompatible_strict_action_env
140+
141+
142+
# still does not work yet
143+
#common --incompatible_enable_proto_toolchain_resolution
144+
145+
# allow newer protobuf to compile
146+
common --experimental_google_legacy_api

.github/workflows/otel_sdk.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
- run: systeminfo
1919
- run: Get-ChildItem env:* | Sort-Object -Property Name | Format-Table -AutoSize -Wrap
2020
- uses: Cyberboss/[email protected]
21-
- run: winget list --accept-source-agreements --disable-interactivity
22-
- run: winget install bazelisk -r bazel --accept-package-agreements --disable-interactivity
23-
- run: winget install -e LLVM.LLVM -v 19.1.0 --accept-package-agreements --disable-interactivity || echo swalloing errors
21+
- run: winget list --accept-source-agreements --disable-interactivity --silent
22+
- run: winget install bazelisk -r bazel --accept-package-agreements --disable-interactivity --silent
23+
- run: winget install -e LLVM.LLVM -v 19.1.0 --accept-package-agreements --disable-interactivity --silent || echo swalloing errors
2424
- uses: actions/checkout@v4
2525
- uses: actions/cache/restore@v4
2626
with:

MODULE.bazel

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ bazel_dep(name = "rules_multitool", version = "0.12.0")
3232
# ERROR: Q:/b/u/c56xnmzt/external/protobuf+/src/google/protobuf/BUILD.bazel:462:11: Compiling src/google/protobuf/any_lite.cc [for tool] failed: undeclared inclusion(s) in rule '@@protobuf+//src/google/protobuf:protobuf_lite':
3333
# this rule is missing dependency declarations for the following files included by 'src/google/protobuf/any_lite.cc':
3434
# 'bazel-out/x64_windows-opt-exec-ST-d610928244b0/bin/external/protobuf+/src/google/protobuf/_virtual_includes/protobuf_lite/google/protobuf/port.h'
35-
#bazel_dep(name = "protobuf", version = "28.2")
36-
bazel_dep(name = "protobuf", version = "26.0.bcr.2")
35+
bazel_dep(name = "protobuf", version = "29.0-rc1")
3736
bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
3837
archive_override(
3938
module_name = "opentelemetry-proto",

x/MODULE.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ bazel_dep(name = "rules_cc", version = "0.0.10")
3232
bazel_dep(name = "rules_pkg", version = "1.0.1")
3333
bazel_dep(name = "rules_proto", version = "6.0.2")
3434
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")
35-
3635
bazel_dep(name = "rules_multitool", version = "0.12.0")
3736
bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
3837
archive_override(

0 commit comments

Comments
 (0)