Skip to content

Commit aeca730

Browse files
authored
chore: pin bazel to 7.4.1 (#375)
1 parent 2dee0c5 commit aeca730

File tree

5 files changed

+40
-26
lines changed

5 files changed

+40
-26
lines changed

pubsub-open-telemetry/.bazelrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ build:macos --cxxopt=-std=c++14
2525
build --experimental_convenience_symlinks=ignore
2626

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

3130

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

6362
# --config otel2: Open Telemetery ABI version 2
6463
build:otel2 --cxxopt=-DOPENTELEMETRY_ABI_VERSION_NO=2
64+
65+
build --noenable_bzlmod
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.0.0
1+
7.4.1

pubsub-open-telemetry/WORKSPACE.bazel

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,33 @@ http_archive(
2424
url = "https://github.com/googleapis/google-cloud-cpp/archive/v2.32.0.tar.gz",
2525
)
2626

27-
load("@google_cloud_cpp//bazel:google_cloud_cpp_deps.bzl", "google_cloud_cpp_deps")
27+
load("@google_cloud_cpp//bazel:workspace0.bzl", "gl_cpp_workspace0")
2828

29-
google_cloud_cpp_deps()
29+
gl_cpp_workspace0()
3030

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

33-
switched_rules_by_language(
34-
name = "com_google_googleapis_imports",
35-
cc = True,
36-
grpc = True,
37-
)
33+
gl_cpp_workspace1()
34+
35+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
36+
37+
gl_cpp_workspace2()
38+
39+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
40+
41+
gl_cpp_workspace3()
42+
43+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
44+
45+
gl_cpp_workspace4()
3846

39-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
47+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
4048

41-
grpc_deps()
49+
gl_cpp_workspace5()
4250

43-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
51+
load("@io_opentelemetry_cpp//bazel:repository.bzl", "opentelemetry_cpp_deps")
4452

45-
grpc_extra_deps()
53+
opentelemetry_cpp_deps()
4654

4755
# Boost
4856
http_archive(

setup/.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.4.1

setup/WORKSPACE.bazel

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,27 @@ http_archive(
2727
# [END cpp_setup_bazel_download]
2828

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

32-
google_cloud_cpp_deps()
32+
gl_cpp_workspace0()
3333

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

36-
switched_rules_by_language(
37-
name = "com_google_googleapis_imports",
38-
cc = True,
39-
grpc = True,
40-
)
36+
gl_cpp_workspace1()
37+
38+
load("@google_cloud_cpp//bazel:workspace2.bzl", "gl_cpp_workspace2")
39+
40+
gl_cpp_workspace2()
41+
42+
load("@google_cloud_cpp//bazel:workspace3.bzl", "gl_cpp_workspace3")
43+
44+
gl_cpp_workspace3()
4145

42-
load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
46+
load("@google_cloud_cpp//bazel:workspace4.bzl", "gl_cpp_workspace4")
4347

44-
grpc_deps()
48+
gl_cpp_workspace4()
4549

46-
load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps")
50+
load("@google_cloud_cpp//bazel:workspace5.bzl", "gl_cpp_workspace5")
4751

48-
grpc_extra_deps()
52+
gl_cpp_workspace5()
4953
# [END cpp_setup_bazel_recurse]

0 commit comments

Comments
 (0)