[bazel] Move buildifier to bzlmod

Switch from building buildifier ourselves to using the `buildifier_prebuilt` module. This also means we don't have to build it from source using a Go toolchain. Signed-off-by: James Wainwright <[email protected]>
lowRISC · Dec 17, 2024 · 8d54ddf · 8d54ddf
1 parent 4df33fb
commit 8d54ddf
Show file tree

Hide file tree

Showing 9 changed files with 154 additions and 78 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -5,6 +5,7 @@
 module(name = "lowrisc_opentitan")
 
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
 
 include("//third_party/rust:rust.MODULE.bazel")
 

diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod
@@ -29,12 +29,6 @@ crt_register_toolchains(riscv32 = True)
 load("//third_party/github:repos.bzl", "github_tools_repos")
 github_tools_repos()
 
-# Go Toolchain (needed by the Buildifier linter)
-load("//third_party/go:repos.bzl", "go_repos")
-go_repos()
-load("//third_party/go:deps.bzl", "go_deps")
-go_deps()
-
 # Various linters
 load("//third_party/lint:repos.bzl", "lint_repos")
 lint_repos()

diff --git a/quality/BUILD.bazel b/quality/BUILD.bazel
@@ -2,7 +2,7 @@
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
 
-load("@bazelbuild_buildtools//buildifier:def.bzl", "buildifier", "buildifier_test")
+load("@buildifier_prebuilt//:rules.bzl", "buildifier", "buildifier_test")
 load("@lowrisc_misc_linters//rules:rules.bzl", "licence_test")
 load("//rules:quality.bzl", "clang_format_check", "clang_format_test", "clang_tidy_rv_test", "clang_tidy_test", "html_coverage_report", "rustfmt_fix", "rustfmt_test")
 

diff --git a/third_party/go/BUILD b/third_party/go/BUILD
diff --git a/third_party/go/deps.bzl b/third_party/go/deps.bzl
diff --git a/third_party/go/repos.bzl b/third_party/go/repos.bzl
diff --git a/third_party/lint/repos.bzl b/third_party/lint/repos.bzl
@@ -12,13 +12,6 @@ def lint_repos(lowrisc_misc_linters = None):
         path = "hw/ip/prim/util/vendor/google_verible_verilog_syntax_py",
     )
 
-    http_archive(
-        name = "bazelbuild_buildtools",
-        sha256 = "05c3c3602d25aeda1e9dbc91d3b66e624c1f9fdadf273e5480b489e744ca7269",
-        strip_prefix = "buildtools-6.4.0",
-        url = "https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.4.0.tar.gz",
-    )
-
     http_archive_or_local(
         name = "lowrisc_misc_linters",
         local = lowrisc_misc_linters,

diff --git a/util/prep-bazel-airgapped-build.sh b/util/prep-bazel-airgapped-build.sh
@@ -141,7 +141,6 @@ if [[ ${AIRGAPPED_DIR_CONTENTS} == "ALL" || \
   ${BAZELISK} fetch \
     --repository_cache=${BAZEL_AIRGAPPED_DIR}/${BAZEL_CACHEDIR} \
     //... \
-    @go_sdk//... \
     @lowrisc_rv32imcb_files//... \
     @local_config_platform//... \
     @python3_toolchains//... \