Skip to content

Commit 5fdc9b8

Browse files
committed
Disable Bzlmod, upgrade Bazel to 7.7.0, and patch Protobuf to fix version mismatch.
1 parent 702570c commit 5fdc9b8

4 files changed

Lines changed: 13 additions & 2 deletions

File tree

.bazelrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,4 @@ build:short_logs --output_filter=DONT_MATCH_ANYTHING
5252

5353
build:macos --macos_minimum_os=10.12
5454

55+
common --noenable_bzlmod

.bazelversion

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
6.5.0
1+
7.7.0
2+

WORKSPACE

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ http_archive(
119119
urls = [
120120
"https://github.com/protocolbuffers/protobuf/archive/refs/tags/v6.31.1.zip",
121121
],
122+
patches = ["//third_party:protobuf_retain_options.patch"],
123+
patch_args = ["-p1"],
122124
)
123125

124126
# ===== TensorFlow dependency =====
@@ -143,7 +145,7 @@ http_archive(
143145
name = "org_tensorflow",
144146
sha256 = _TENSORFLOW_ARCHIVE_SHA256,
145147
urls = [
146-
"https://github.com/tensorflow/tensorflow/archive/%s.tar.gz" % _TENSORFLOW_GIT_COMMIT,
148+
"https://github.com/tensorflow/tensorflow/archive/v%s.tar.gz" % _TENSORFLOW_GIT_COMMIT,
147149
],
148150
strip_prefix = "tensorflow-%s" % _TENSORFLOW_GIT_COMMIT,
149151
patches = ["//third_party:tensorflow.patch"],
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
--- a/bazel/private/proto_library_rule.bzl
2+
+++ b/b/bazel/private/proto_library_rule.bzl
3+
@@ -166,4 +166,3 @@
4+
if ctx.attr._experimental_proto_descriptor_sets_include_source_info[BuildSettingInfo].value:
5+
args.add("--include_source_info")
6+
- args.add("--retain_options")
7+

0 commit comments

Comments
 (0)