Skip to content

Commit

Permalink
chore: pin bazel to 7.4.1 (#375)
Browse files Browse the repository at this point in the history
  • Loading branch information
dbolduc authored Dec 18, 2024
1 parent 2dee0c5 commit aeca730
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 26 deletions.
3 changes: 2 additions & 1 deletion pubsub-open-telemetry/.bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ build:macos --cxxopt=-std=c++14
build --experimental_convenience_symlinks=ignore

# Enable OpenTelemetry tracing instrumentation for google-cloud-cpp.
build --@io_opentelemetry_cpp//api:with_abseil
build --@google_cloud_cpp//:enable_opentelemetry


Expand Down Expand Up @@ -62,3 +61,5 @@ build:tsan --action_env=TSAN_OPTIONS=halt_on_error=1:second_deadlock_stack=1:rep

# --config otel2: Open Telemetery ABI version 2
build:otel2 --cxxopt=-DOPENTELEMETRY_ABI_VERSION_NO=2

build --noenable_bzlmod
2 changes: 1 addition & 1 deletion pubsub-open-telemetry/.bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.0.0
7.4.1
32 changes: 20 additions & 12 deletions pubsub-open-telemetry/WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,33 @@ http_archive(
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.32.0.tar.gz",
)

load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")

google_cloud_cpp_deps()
gl_cpp_workspace0()

load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")

switched_rules_by_language(
name = "com_google_googleapis_imports",
cc = True,
grpc = True,
)
gl_cpp_workspace1()

load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")

gl_cpp_workspace2()

load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")

gl_cpp_workspace3()

load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")

gl_cpp_workspace4()

load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")

grpc_deps()
gl_cpp_workspace5()

load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")

grpc_extra_deps()
opentelemetry_cpp_deps()

# Boost
http_archive(
Expand Down
1 change: 1 addition & 0 deletions setup/.bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7.4.1
28 changes: 16 additions & 12 deletions setup/WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,27 @@ http_archive(
# [END cpp_setup_bazel_download]

# [START cpp_setup_bazel_recurse]
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")

google_cloud_cpp_deps()
gl_cpp_workspace0()

load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
load("@google_cloud_cpp//bazel:workspace1.bzl", "gl_cpp_workspace1")

switched_rules_by_language(
name = "com_google_googleapis_imports",
cc = True,
grpc = True,
)
gl_cpp_workspace1()

load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")

gl_cpp_workspace2()

load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")

gl_cpp_workspace3()

load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")

grpc_deps()
gl_cpp_workspace4()

load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")

grpc_extra_deps()
gl_cpp_workspace5()
# [END cpp_setup_bazel_recurse]

0 comments on commit aeca730

Please sign in to comment.