Clean up buildifier (#168)

* Clean up build files

Author: tzaeschke

.github/workflows/bazel.yml

@@ -38,7 +38,7 @@ jobs:
 
       - name: Bazel format
         shell: bash
-        run: ./ci/linting/buildifier.sh
+        run: bazel run //:buildifier.check
 
       - name: Build
         shell: bash

BUILD

@@ -1,4 +1,4 @@
-load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+load("@buildifier_prebuilt//:rules.bzl", "buildifier")
 load("@rules_cc//cc:defs.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
@@ -53,17 +53,26 @@ config_setting(
     constraint_values = ["@platforms//os:windows"],
 )
 
-# Buildifier
+buildifier(
+    name = "buildifier.fix",
+    diff_command = "diff",
+    exclude_patterns = [
+        "./.git/*",
+        "./.clwb/*",
+    ],
+    lint_mode = "fix",
+    mode = "fix",
+)
 
-sh_binary(
-    name = "buildifier",
-    srcs = select(
-        {
-            ":linux": ["@buildifier_linux//file"],
-            ":macos": ["@buildifier_macos//file"],
-            ":windows": ["@buildifier_windows//file"],
-        },
-    ),
+buildifier(
+    name = "buildifier.check",
+    diff_command = "diff",
+    exclude_patterns = [
+        "./.git/*",
+        "./.clwb/*",
+    ],
+    lint_mode = "warn",
+    mode = "diff",
 )
 
 # Aspect-based clang-format

CHANGELOG.md

@@ -5,7 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-- Nothing yet
+
+- Upgraded buildifier
+  [#168](https://github.com/tzaeschke/phtree-cpp/pull/168)
 
 ## [1.7.0] - 2025-03-01
 ### Changed

MODULE.bazel

@@ -13,37 +13,4 @@ bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
 bazel_dep(name = "spdlog", version = "1.17.0")
 bazel_dep(name = "google_benchmark", version = "1.9.5")
 
-# Development environment tooling
-http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
-
-BUILDIFIER_VERSION = "0.29.0"
-
-http_file(
-    name = "buildifier_linux",
-    executable = True,
-    sha256 = "4c985c883eafdde9c0e8cf3c8595b8bfdf32e77571c369bf8ddae83b042028d6",
-    urls = ["https://github.com/bazelbuild/buildtools/releases/download/{version}/buildifier".format(version = BUILDIFIER_VERSION)],
-)
-
-http_file(
-    name = "buildifier_macos",
-    executable = True,
-    sha256 = "9b108decaa9a624fbac65285e529994088c5d15fecc1a30866afc03a48619245",
-    urls = ["https://github.com/bazelbuild/buildtools/releases/download/{version}/buildifier.mac".format(version = BUILDIFIER_VERSION)],
-)
-
-http_file(
-    name = "buildifier_windows",
-    executable = True,
-    sha256 = "dc5d6ed5e3e0dbe9955f7606939c627af5a2be7f9bdd8814e77a22109164394f",
-    urls = ["https://github.com/bazelbuild/buildtools/releases/download/{version}/buildifier.exe".format(version = BUILDIFIER_VERSION)],
-)
-
-http_archive(
-    name = "bazel_compilation_database",
-    sha256 = "bb1b812396e2ee36a50a13b03ae6833173ce643e8a4bd50731067d0b4e5c6e86",
-    strip_prefix = "bazel-compilation-database-0.3.5",
-    url = "https://github.com/grailbio/bazel-compilation-database/archive/0.3.5.tar.gz",
-)
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.1", dev_dependency = True)

MODULE.bazel.lock

@@ -4,13 +4,20 @@
 ## Verify code
 
 ### Run tests
+```shell
 CC=gcc bazel test ... --config=asan
 CC=clang bazel test ... --config=asan
 CC=clang bazel test ... --config=msan
 CC=clang bazel test ... --config=ubsan
+```
 
 Record versions: e.g. gcc 13.3, clang 18.1.3
 
+```shell
+bazel run //:buildifier.check
+bazel run //:buildifier.fix
+```
+
 ### Run examples
 ```shell
 bazel run //examples:example

ReleaseHowTo.md

@@ -32,6 +32,8 @@
 #
 #   Bazel Build for Google C++ Testing Framework(Google Test)
 
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])

third_party/gtest/BUILD

@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 licenses(["notice"])
 
 cc_library(