chore: update to latest version of Aspect CLI and turn on additional workflows features
diff --git a/.aspect/workflows/config.yaml b/.aspect/workflows/config.yaml index 993f14f..0db08c9 100644 --- a/.aspect/workflows/config.yaml +++ b/.aspect/workflows/config.yaml
@@ -2,9 +2,19 @@ env: CC: /bin/false workspaces: - - . - - e2e/bzlmod - - e2e/copy_to_directory + .: + icon: js + label: bazel-lib + e2e/bzlmod: + icon: bazel + tasks: + buildifier: + without: true + e2e/copy_to_directory: + icon: bazel + tasks: + buildifier: + without: true tasks: - branch_freshness: + buildifier: test:
diff --git a/.bazeliskrc b/.bazeliskrc index 333e459..d0fc2ec 100644 --- a/.bazeliskrc +++ b/.bazeliskrc
@@ -1,2 +1,2 @@ BAZELISK_BASE_URL=https://github.com/aspect-build/aspect-cli/releases/download -USE_BAZEL_VERSION=aspect/5.2.1 +USE_BAZEL_VERSION=aspect/5.3.4
diff --git a/BUILD.bazel b/BUILD.bazel index 6de2045..78df84b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel
@@ -1,6 +1,7 @@ load("@aspect_bazel_lib_host//:defs.bzl", "host") load("@bazel_skylib//:bzl_library.bzl", "bzl_library") load("@bazel_gazelle//:def.bzl", "DEFAULT_LANGUAGES", "gazelle", "gazelle_binary") +load("@buildifier_prebuilt//:rules.bzl", "buildifier") load("//lib:write_source_files.bzl", "write_source_files") load("//lib:yq.bzl", "yq") load("//lib:diff_test.bzl", "diff_test") @@ -92,3 +93,19 @@ actual = ".bazelversion", expected = str(host.bazel_version), ) + +bzl_library( + name = "deps", + srcs = ["deps.bzl"], + visibility = ["//visibility:public"], + deps = ["@bazel_gazelle//:deps"], +) + +buildifier( + name = "buildifier.check", + exclude_patterns = [ + "./.git/*", + ], + lint_mode = "warn", + mode = "diff", +)
diff --git a/WORKSPACE b/WORKSPACE index 24f8fb2..f527a91 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -46,3 +46,13 @@ go_register_toolchains(version = "1.18.3") gazelle_dependencies() + +############################################ +# Buildifier, for formatting BUILD and bzl files +load("@buildifier_prebuilt//:deps.bzl", "buildifier_prebuilt_deps") + +buildifier_prebuilt_deps() + +load("@buildifier_prebuilt//:defs.bzl", "buildifier_prebuilt_register_toolchains") + +buildifier_prebuilt_register_toolchains()
diff --git a/internal_deps.bzl b/internal_deps.bzl index 02eb652..7cf586d 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl
@@ -53,6 +53,15 @@ ], ) + http_archive( + name = "buildifier_prebuilt", + sha256 = "95387c9dded7f8e3bdd4c598bc2ca4fbb6366cb214fa52e7d7b689eb2f421e01", + strip_prefix = "buildifier-prebuilt-6.0.0", + urls = [ + "https://github.com/keith/buildifier-prebuilt/archive/6.0.0.tar.gz", + ], + ) + # Register toolchains for tests register_jq_toolchains() register_yq_toolchains()