Skip to content

Commit f1e3262

Browse files
deannagarciacopybara-github
authored andcommitted
Upgrade rules_fuzzing to prepare for bazel 8.
Note that [email protected] is not yet on BCR so we use archive_override to work around that in MODULE.bazel for now. PiperOrigin-RevId: 743664714
1 parent 620ed5f commit f1e3262

File tree

3 files changed

+20
-26
lines changed

3 files changed

+20
-26
lines changed

MODULE.bazel

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,26 @@ bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
3939
bazel_dep(name = "bazel_features", version = "1.23.0", repo_name = "proto_bazel_features")
4040
bazel_dep(name = "bazel_skylib", version = "1.7.1")
4141
bazel_dep(name = "jsoncpp", version = "1.9.6")
42-
bazel_dep(name = "rules_fuzzing", version = "0.5.2")
4342
bazel_dep(name = "rules_java", version = "8.6.1")
4443
bazel_dep(name = "rules_jvm_external", version = "6.3")
4544
bazel_dep(name = "rules_kotlin", version = "1.9.6")
4645
bazel_dep(name = "rules_license", version = "1.0.0")
4746
bazel_dep(name = "rules_pkg", version = "1.0.1")
4847
bazel_dep(name = "rules_python", version = "1.0.0")
49-
bazel_dep(name = "rules_rust", version = "0.56.0", dev_dependency = True)
5048

49+
bazel_dep(name = "rules_rust", version = "0.56.0", dev_dependency = True)
5150
bazel_dep(name = "rules_ruby", version = "0.17.3", dev_dependency = True)
5251

52+
# Workaround for https://github.com/bazelbuild/bazel-central-registry/issues/4230
53+
# rules_fuzzing 0.5.3 is not yet available in BCR.
54+
bazel_dep(name = "rules_fuzzing", version = "0.5.3", dev_dependency = True)
55+
archive_override(
56+
module_name = "rules_fuzzing",
57+
integrity = "sha256-CCdEIsQ4NBbfX5gpQ+QNWBQfdJwJAIu3gEQO7OaxE+Q=",
58+
strip_prefix = "rules_fuzzing-0.5.3",
59+
urls = ["https://github.com/bazelbuild/rules_fuzzing/archive/v0.5.3.tar.gz"],
60+
)
61+
5362
# Workaround for https://github.com/bazel-contrib/rules_ruby/issues/216
5463
# Patch rules_ruby to disable automatic attempt to install bundler. When fixed,
5564
# delete Disable_bundle_install.patch and single_version_override() below.
@@ -232,8 +241,6 @@ bazel_dep(name = "com_google_protobuf_v25", version = "25.0", dev_dependency = T
232241
archive_override(
233242
module_name = "com_google_protobuf_v25",
234243
integrity = "sha256-e+7ZxRHWMs/3wirACU3Xcg5VAVMDnV2n4Fm8zrSIR0o=",
235-
strip_prefix = "protobuf-25.0",
236-
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v25.0/protobuf-25.0.tar.gz"],
237244
patch_strip = 1,
238245
patches = [
239246
"@com_google_protobuf//:patches/protobuf_v25/0001-Add-MODULE.bazel.patch",
@@ -243,16 +250,18 @@ archive_override(
243250
"@com_google_protobuf//:patches/protobuf_v25/0005-Make-rules_ruby-a-dev-only-dependency.patch",
244251
"@com_google_protobuf//:patches/protobuf_v25/0006-Add-repo_name.patch",
245252
],
253+
strip_prefix = "protobuf-25.0",
254+
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v25.0/protobuf-25.0.tar.gz"],
246255
)
247256

248257
bazel_dep(name = "com_google_protobuf_previous_release", version = "29.0", dev_dependency = True)
249258
archive_override(
250259
module_name = "com_google_protobuf_previous_release",
251260
integrity = "sha256-EKDVjzmhqQnpXgDougtbHcZNApl/dBFRlTorNln254w=",
252-
strip_prefix = "protobuf-29.0",
253-
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v29.0/protobuf-29.0.tar.gz"],
254261
patch_strip = 1,
255262
patches = [
256263
"@com_google_protobuf//:patches/protobuf_v29/0001-Update-module-name.patch",
257264
],
265+
strip_prefix = "protobuf-29.0",
266+
urls = ["https://github.com/protocolbuffers/protobuf/releases/download/v29.0/protobuf-29.0.tar.gz"],
258267
)

WORKSPACE

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,9 @@ http_archive(
232232

233233
http_archive(
234234
name = "rules_fuzzing",
235-
patch_args = ["-p1"],
236-
patches = ["//third_party:rules_fuzzing.patch"],
237-
sha256 = "77206c54b71f4dd5335123a6ff2a8ea688eca5378d34b4838114dff71652cf26",
238-
strip_prefix = "rules_fuzzing-0.5.1",
239-
urls = ["https://github.com/bazelbuild/rules_fuzzing/releases/download/v0.5.1/rules_fuzzing-0.5.1.zip"],
235+
integrity = "sha256-CCdEIsQ4NBbfX5gpQ+QNWBQfdJwJAIu3gEQO7OaxE+Q=",
236+
strip_prefix = "rules_fuzzing-0.5.3",
237+
urls = ["https://github.com/bazelbuild/rules_fuzzing/archive/v0.5.3.tar.gz"],
240238
)
241239

242240
load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
@@ -295,13 +293,13 @@ crate_repositories()
295293
http_archive(
296294
name = "com_google_protobuf_v25",
297295
integrity = "sha256-e+7ZxRHWMs/3wirACU3Xcg5VAVMDnV2n4Fm8zrSIR0o=",
298-
strip_prefix = "protobuf-25.0",
299-
url = "https://github.com/protocolbuffers/protobuf/releases/download/v25.0/protobuf-25.0.tar.gz",
300296
patch_args = ["-p1"],
301297
patches = [
302298
# There are other patches, but they are only needed for bzlmod.
303299
"@com_google_protobuf//:patches/protobuf_v25/0005-Make-rules_ruby-a-dev-only-dependency.patch",
304300
],
301+
strip_prefix = "protobuf-25.0",
302+
url = "https://github.com/protocolbuffers/protobuf/releases/download/v25.0/protobuf-25.0.tar.gz",
305303
)
306304

307305
# Needed as a dependency of @com_google_protobuf_v25

third_party/rules_fuzzing.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)