bazel: migrate rules_proto to bzlmod

edgelesssys · May 22, 2024 · 9061c62 · 9061c62
1 parent 2a8a400
commit 9061c62
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 34 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -7,6 +7,7 @@ bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0")
 bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "rules_go", version = "0.47.1", repo_name = "io_bazel_rules_go")
 bazel_dep(name = "rules_pkg", version = "0.10.1")
+bazel_dep(name = "rules_proto", version = "6.0.0")
 bazel_dep(name = "rules_python", version = "0.32.2")
 
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)

diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
@@ -142,17 +142,6 @@ nixpkgs_python_configure(
 
 # gazelle:repo gazelle
 
-# proto toolchain
-load("//bazel/toolchains:proto_deps.bzl", "proto_deps")
-
-proto_deps()
-
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-
-rules_proto_dependencies()
-
-rules_proto_toolchains()
-
 # C / C++ toolchains
 
 load("@hermetic_cc_toolchain//toolchain:defs.bzl", zig_toolchains = "toolchains")

diff --git a/bazel/toolchains/proto_deps.bzl b/bazel/toolchains/proto_deps.bzl
diff --git a/bootstrapper/initproto/init.pb.go b/bootstrapper/initproto/init.pb.go
diff --git a/debugd/service/debugd.pb.go b/debugd/service/debugd.pb.go
diff --git a/disk-mapper/recoverproto/recover.pb.go b/disk-mapper/recoverproto/recover.pb.go
diff --git a/internal/versions/components/components.pb.go b/internal/versions/components/components.pb.go
diff --git a/joinservice/joinproto/join.pb.go b/joinservice/joinproto/join.pb.go
diff --git a/keyservice/keyserviceproto/keyservice.pb.go b/keyservice/keyserviceproto/keyservice.pb.go
diff --git a/upgrade-agent/upgradeproto/upgrade.pb.go b/upgrade-agent/upgradeproto/upgrade.pb.go
diff --git a/verify/verifyproto/verify.pb.go b/verify/verifyproto/verify.pb.go