From 865f096f41b409c27664b74768a7250d153e791a Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Tue, 21 May 2024 13:47:12 +0200 Subject: [PATCH] bazel: migrate buildifier to bzlmod --- MODULE.bazel | 2 ++ WORKSPACE.bzlmod | 5 ----- bazel/ci/BUILD.bazel | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index e841705fe..960eaf75f 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -6,3 +6,5 @@ bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0") bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "rules_pkg", version = "0.10.1") 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 index a3c9241bd..27df542fe 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -177,11 +177,6 @@ rules_proto_dependencies() rules_proto_toolchains() -# Buildifier -load("//bazel/toolchains:buildifier_deps.bzl", "buildifier_deps") - -buildifier_deps() - # C / C++ toolchains load("@hermetic_cc_toolchain//toolchain:defs.bzl", zig_toolchains = "toolchains") diff --git a/bazel/ci/BUILD.bazel b/bazel/ci/BUILD.bazel index 10c926ef9..82e27a0ac 100644 --- a/bazel/ci/BUILD.bazel +++ b/bazel/ci/BUILD.bazel @@ -1,6 +1,6 @@ load("@bazel_gazelle//:def.bzl", "gazelle") +load("@buildifier_prebuilt//:rules.bzl", "buildifier", "buildifier_test") load("@com_github_ash2k_bazel_tools//multirun:def.bzl", "command", "multirun") -load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier", "buildifier_test") load("//bazel/ci:proto_targets.bzl", "proto_targets") load("//bazel/sh:def.bzl", "noop_warn", "repo_command", "sh_template")