Skip to content

Commit f8e51f1

Browse files
committed
chore: enable bzlmod, move rules_proto to bzlmod
1 parent 1625242 commit f8e51f1

File tree

17 files changed

+30
-54
lines changed

17 files changed

+30
-54
lines changed

.bazelrc

-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ common --enable_platform_specific_config
1111

1212
common:release -c opt --stamp --workspace_status_command="node tools/workspace_status.js"
1313

14-
# bzlmod causes issues with LLVM toolchain
15-
common --noenable_bzlmod
16-
1714
# --incompatible_disallow_empty_glob setting from .aspect/bazelrc/correctness.bazelrc causes issues with LLVM toolchain
1815
common --noincompatible_disallow_empty_glob
1916

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
/.vscode
77
**/.terraform/*
88
node_modules/
9+
MODULE.bazel.lock

MODULE.bazel

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module(
2+
name = "aspect_cli",
3+
version = "0.0.0",
4+
)
5+
6+
bazel_dep(name = "aspect_bazel_lib", version = "2.10.0")
7+
bazel_dep(name = "bazel_features", version = "1.19.0")
8+
9+
include("//bazel/include:proto.MODULE.bazel")

WORKSPACE

-40
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,6 @@ register_toolchains(
2222
"@zig_sdk//toolchain:windows_arm64",
2323
)
2424

25-
http_archive(
26-
name = "bazel_features",
27-
sha256 = "3646ffd447753490b77d2380fa63f4d55dd9722e565d84dfda01536b48e183da",
28-
strip_prefix = "bazel_features-1.19.0",
29-
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.19.0/bazel_features-v1.19.0.tar.gz",
30-
)
31-
32-
http_archive(
33-
name = "aspect_bazel_lib",
34-
sha256 = "7b39d9f38b82260a8151b18dd4a6219d2d7fc4a0ac313d4f5a630ae6907d205d",
35-
strip_prefix = "bazel-lib-2.10.0",
36-
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.10.0/bazel-lib-v2.10.0.tar.gz",
37-
)
38-
3925
http_archive(
4026
name = "aspect_rules_swc",
4127
sha256 = "e5ac926ebe1bbef1f38d245a65626d86f114eb1f3c68362e8a33472351d83608",
@@ -230,32 +216,6 @@ http_archive(
230216
urls = ["https://github.com/bazel-contrib/bazel-gazelle/releases/download/v0.41.0/bazel-gazelle-v0.41.0.tar.gz"],
231217
)
232218

233-
http_archive(
234-
name = "rules_proto",
235-
sha256 = "303e86e722a520f6f326a50b41cfc16b98fe6d1955ce46642a5b7a67c11c0f5d",
236-
strip_prefix = "rules_proto-6.0.0",
237-
url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.0/rules_proto-6.0.0.tar.gz",
238-
)
239-
240-
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
241-
242-
rules_proto_dependencies()
243-
244-
http_archive(
245-
name = "toolchains_protoc",
246-
sha256 = "1f3cd768bbb92164952301228bac5e5079743843488598f2b17fecd41163cadb",
247-
strip_prefix = "toolchains_protoc-0.2.4",
248-
url = "https://github.com/aspect-build/toolchains_protoc/releases/download/v0.2.4/toolchains_protoc-v0.2.4.tar.gz",
249-
)
250-
251-
load("@toolchains_protoc//protoc:toolchain.bzl", "protoc_toolchains")
252-
253-
protoc_toolchains(
254-
name = "protoc_toolchains",
255-
google_protobuf = "com_google_protobuf",
256-
version = "v21.7",
257-
)
258-
259219
http_archive(
260220
name = "rules_python",
261221
integrity = "sha256-bERKXOYmJB6fdw/0TFPBLWen8f+81eG2p0EAneLkBAo=",

bazel/action_cache/action_cache.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/analysis/analysis_v2.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/buildeventstream/build_event_stream.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/command_line/command_line.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/failure_details/failure_details.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/flags/flags.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/include/BUILD.bazel

Whitespace-only changes.

bazel/include/proto.MODULE.bazel

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
bazel_dep(name = "rules_proto", version = "6.0.2")
2+
bazel_dep(name = "toolchains_protoc", version = "0.3.3")
3+
4+
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
5+
protoc.toolchain(
6+
name = "protoc_toolchains",
7+
version = "v21.7",
8+
)
9+
use_repo(protoc, "com_google_protobuf")

bazel/invocation_policy/invocation_policy.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/options/option_filters.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/packages_metrics/package_load_metrics.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/query/build.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/plugin/sdk/v1alpha4/proto/plugin.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)