Skip to content

Commit 15dcfe6

Browse files
committed
chore: give up on bazel8 without bzlmod
Revert WORKSPACE-only changes
1 parent 6845829 commit 15dcfe6

File tree

3 files changed

+7
-36
lines changed

3 files changed

+7
-36
lines changed

.github/workflows/ci.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ jobs:
2525
[
2626
{"folder": ".", "bzlmodEnabled": false},
2727
{"folder": "examples", "bzlmodEnabled": false},
28+
{"bazelversion": "8.0.0", "bzlmodEnabled": false},
2829
]

e2e/smoke/WORKSPACE.bazel

-23
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
2222

2323
rules_proto_dependencies()
2424

25-
load("@rules_proto//proto:setup.bzl", "rules_proto_setup")
26-
27-
rules_proto_setup()
28-
2925
load("@bazel_features//:deps.bzl", "bazel_features_deps")
3026

3127
bazel_features_deps()
@@ -36,22 +32,3 @@ protoc_toolchains(
3632
name = "protoc_toolchains",
3733
version = "v25.3",
3834
)
39-
40-
# com_google_protobuf leaks a java dependency:
41-
# /home/runner/.bazel/external/com_google_protobuf/bazel/java_proto_library.bzl:9:6:
42-
# at /home/runner/.bazel/external/com_google_protobuf/bazel/private/bazel_java_proto_library_rule.bzl:9:6:
43-
# at /home/runner/.bazel/external/rules_java/java/common/java_info.bzl:16:6:
44-
# Unable to find package for @@compatibility_proxy//:proxy.bzl
45-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
46-
47-
http_archive(
48-
name = "rules_java",
49-
sha256 = "5449ed36d61269579dd9f4b0e532cd131840f285b389b3795ae8b4d717387dd8",
50-
urls = [
51-
"https://github.com/bazelbuild/rules_java/releases/download/8.7.0/rules_java-8.7.0.tar.gz",
52-
],
53-
)
54-
55-
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
56-
57-
rules_java_dependencies()

protoc/repositories.bzl

+6-13
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,16 @@ def rules_protoc_dependencies():
2121
# The minimal version of bazel_skylib we require
2222
http_archive(
2323
name = "bazel_skylib",
24-
sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f",
24+
sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
2525
urls = [
26-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
27-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz",
26+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
27+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
2828
],
2929
)
3030

31-
http_archive(
32-
name = "bazel_features",
33-
sha256 = "8b1c9b7558498000f5adebbc584b7bf15b6b2bf181448a66f6b2fc5b4c84231c",
34-
strip_prefix = "bazel_features-1.23.0",
35-
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.23.0/bazel_features-v1.23.0.tar.gz",
36-
)
37-
3831
http_archive(
3932
name = "rules_proto",
40-
sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4",
41-
strip_prefix = "rules_proto-7.1.0",
42-
url = "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz",
33+
sha256 = "71fdbed00a0709521ad212058c60d13997b922a5d01dbfd997f0d57d689e7b67",
34+
strip_prefix = "rules_proto-6.0.0-rc2",
35+
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.0-rc2/rules_proto-6.0.0-rc2.tar.gz",
4336
)

0 commit comments

Comments
 (0)