Skip to content

Commit b65df06

Browse files
committed
feat: build core with bazel 8
Moving the core tool to bazel 8, make sure we use the proper prebuilt protoc now
1 parent 955f4b6 commit b65df06

File tree

5 files changed

+14
-66
lines changed

5 files changed

+14
-66
lines changed

.bazelrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Import Aspect bazelrc presets
2-
try-import %workspace%/.aspect/bazelrc/bazel7.bazelrc # will only work in bazel7+
3-
import %workspace%/.aspect/bazelrc/bazel6.bazelrc # will only work in bazel6+
2+
import %workspace%/.aspect/bazelrc/bazel7.bazelrc # will only work in bazel7+
43
import %workspace%/.aspect/bazelrc/convenience.bazelrc
54
import %workspace%/.aspect/bazelrc/correctness.bazelrc
65
import %workspace%/.aspect/bazelrc/debug.bazelrc
@@ -11,6 +10,7 @@ common --incompatible_enable_proto_toolchain_resolution
1110

1211
# inside the rules project we build from source
1312
common --extra_toolchains=//cmd:bazeldnf-host-toolchain
13+
common --@protobuf//bazel/toolchains:prefer_prebuilt_protoc
1414

1515
# make sure bazel doesn't complain on hosts without java
1616
common --java_runtime_version=remotejdk_21

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.x
1+
8.x

MODULE.bazel

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ use_repo(
1717
register_toolchains("@bazeldnf_toolchains//:all")
1818

1919
# bazeldnf starlark dependenies
20-
bazel_dep(name = "bazel_skylib", version = "1.8.0")
20+
bazel_dep(name = "bazel_skylib", version = "1.9.0")
2121
bazel_dep(name = "platforms", version = "1.0.0")
22-
bazel_dep(name = "bazel_features", version = "1.38.0")
22+
bazel_dep(name = "bazel_features", version = "1.41.0")
2323

2424
# if someone wants to build the bazeldnf toolchain from sources needs this set of dependencies
2525
bazel_dep(name = "gazelle", version = "0.47.0")
26-
bazel_dep(name = "rules_go", version = "0.59.0")
26+
bazel_dep(name = "rules_go", version = "0.60.0")
2727

2828
go_sdk = use_extension("@rules_go//go:extensions.bzl", "go_sdk", dev_dependency = True)
2929
go_sdk.download(version = "1.24.1")
@@ -87,32 +87,13 @@ use_repo(
8787
"bazeldnf_internal_libvirt-libs",
8888
)
8989

90-
bazel_dep(name = "protobuf", version = "33.1", dev_dependency = True)
91-
bazel_dep(name = "toolchains_protoc", version = "0.6.0", dev_dependency = True)
92-
93-
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc", dev_dependency = True)
94-
use_repo(protoc, "toolchains_protoc_hub")
90+
bazel_dep(name = "protobuf", version = "33.5", dev_dependency = True)
9591

9692
# deps only needed for the repo internals
97-
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.8.2", dev_dependency = True)
98-
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2", dev_dependency = True)
99-
bazel_dep(name = "buildifier_prebuilt", version = "8.2.1", dev_dependency = True)
100-
bazel_dep(name = "rules_pkg", version = "1.1.0", dev_dependency = True)
101-
bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True)
102-
bazel_dep(name = "rules_proto", version = "7.1.0", dev_dependency = True)
103-
bazel_dep(name = "rules_java", version = "9.0.3", dev_dependency = True)
104-
105-
protobuf_java = use_extension("//bazeldnf:extensions.bzl", "protobuf_java", dev_dependency = True)
106-
use_repo(protobuf_java, "protobuf-java")
107-
108-
register_toolchains(
109-
"//tools/toolchains:all",
110-
dev_dependency = True,
111-
)
112-
113-
register_toolchains(
114-
"@toolchains_protoc_hub//:all",
115-
dev_dependency = True,
116-
)
117-
118-
bazel_dep(name = "rules_cc", version = "0.2.14", dev_dependency = True)
93+
bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.9.0", dev_dependency = True)
94+
bazel_dep(name = "aspect_bazel_lib", version = "2.22.5", dev_dependency = True)
95+
bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.2", dev_dependency = True)
96+
bazel_dep(name = "rules_pkg", version = "1.2.0", dev_dependency = True)
97+
bazel_dep(name = "stardoc", version = "0.8.1", dev_dependency = True)
98+
bazel_dep(name = "rules_java", version = "9.5.0", dev_dependency = True)
99+
bazel_dep(name = "rules_cc", version = "0.2.16", dev_dependency = True)

bazeldnf/extensions.bzl

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -424,27 +424,3 @@ bazeldnf = module_extension(
424424
"config": _config_tag,
425425
},
426426
)
427-
428-
def _protobuf_java_extension(module_ctx):
429-
http_jar(
430-
name = "protobuf-java",
431-
integrity = "sha256-0C+GOpCj/8d9Xu7AMcGOV58wx8uY8/OoFP6LiMQ9O8g=",
432-
urls = ["https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/4.27.3/protobuf-java-4.27.3.jar"],
433-
)
434-
435-
kwargs = {}
436-
if bazel_features.external_deps.extension_metadata_has_reproducible:
437-
kwargs["reproducible"] = True
438-
439-
if module_ctx.root_module_has_non_dev_dependency:
440-
kwargs["root_module_direct_deps"] = []
441-
kwargs["root_module_direct_dev_deps"] = ["protobuf-java"]
442-
else:
443-
kwargs["root_module_direct_deps"] = []
444-
kwargs["root_module_direct_dev_deps"] = ["protobuf-java"]
445-
446-
return module_ctx.extension_metadata(**kwargs)
447-
448-
protobuf_java = module_extension(
449-
implementation = _protobuf_java_extension,
450-
)

tools/toolchains/BUILD.bazel

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

0 commit comments

Comments
 (0)