Skip to content

Commit

Permalink
updated to latest protobuf
Browse files Browse the repository at this point in the history
  • Loading branch information
malkia committed Oct 2, 2024
1 parent 872d2f4 commit bb9632c
Show file tree
Hide file tree
Showing 5 changed files with 2,957 additions and 41 deletions.
7 changes: 7 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,10 @@ build:clang-cl --host_per_file_copt="c-ares\\+/.*@-Wno-macro-redefined"
build:clang-cl --copt=-Wno-missing-template-arg-list-after-template-kw

build --incompatible_strict_action_env


# still does not work yet
#common --incompatible_enable_proto_toolchain_resolution

# allow newer protobuf to compile
common --experimental_google_legacy_api
6 changes: 3 additions & 3 deletions .github/workflows/otel_sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
- run: systeminfo
- run: Get-ChildItem env:* | Sort-Object -Property Name | Format-Table -AutoSize -Wrap
- uses: Cyberboss/[email protected]
- run: winget list --accept-source-agreements --disable-interactivity
- run: winget install bazelisk -r bazel --accept-package-agreements --disable-interactivity
- run: winget install -e LLVM.LLVM -v 19.1.0 --accept-package-agreements --disable-interactivity || echo swalloing errors
- run: winget list --accept-source-agreements --disable-interactivity --silent
- run: winget install bazelisk -r bazel --accept-package-agreements --disable-interactivity --silent
- run: winget install -e LLVM.LLVM -v 19.1.0 --accept-package-agreements --disable-interactivity --silent || echo swalloing errors
- uses: actions/checkout@v4
- uses: actions/cache/restore@v4
with:
Expand Down
3 changes: 1 addition & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ bazel_dep(name = "rules_multitool", version = "0.12.0")
# 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':
# this rule is missing dependency declarations for the following files included by 'src/google/protobuf/any_lite.cc':
# 'bazel-out/x64_windows-opt-exec-ST-d610928244b0/bin/external/protobuf+/src/google/protobuf/_virtual_includes/protobuf_lite/google/protobuf/port.h'
#bazel_dep(name = "protobuf", version = "28.2")
bazel_dep(name = "protobuf", version = "26.0.bcr.2")
bazel_dep(name = "protobuf", version = "29.0-rc1")
bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
archive_override(
module_name = "opentelemetry-proto",
Expand Down
1 change: 0 additions & 1 deletion x/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ bazel_dep(name = "rules_cc", version = "0.0.10")
bazel_dep(name = "rules_pkg", version = "1.0.1")
bazel_dep(name = "rules_proto", version = "6.0.2")
bazel_dep(name = "zlib", version = "1.3.1.bcr.3")

bazel_dep(name = "rules_multitool", version = "0.12.0")
bazel_dep(name = "opentelemetry-proto", version = "1.3.2")
archive_override(
Expand Down
Loading

0 comments on commit bb9632c

Please sign in to comment.