From 3e33782a90a36094acbff9bb3066183331f1b1ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 Feb 2023 10:53:38 -0800 Subject: [PATCH 1/7] chore(deps): update dependency aspect_bazel_lib to v1.26.2 (#50) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- internal_deps.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal_deps.bzl b/internal_deps.bzl index 8b1891d6..3d4da10c 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -80,9 +80,9 @@ def rules_zig_internal_deps(): http_archive( name = "aspect_bazel_lib", - sha256 = "ae56efc54ce3025ea908900e0d061423310b15e4676ae1359105583a2944665c", - strip_prefix = "bazel-lib-1.19.1", - url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v1.19.1.tar.gz", + sha256 = "dce068f085e9eabfec6d795caaabdbbe4a73550810f3cae3035aff7162e42b3c", + strip_prefix = "bazel-lib-1.26.2", + url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v1.26.2.tar.gz", ) http_archive( From b0010388945ae567bf42819629d9fd1d3f194e51 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Mar 2023 11:25:22 -0800 Subject: [PATCH 2/7] chore(deps): update dependency aspect_bazel_lib to v1.29.0 (#51) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- internal_deps.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal_deps.bzl b/internal_deps.bzl index 3d4da10c..550d2081 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -80,9 +80,9 @@ def rules_zig_internal_deps(): http_archive( name = "aspect_bazel_lib", - sha256 = "dce068f085e9eabfec6d795caaabdbbe4a73550810f3cae3035aff7162e42b3c", - strip_prefix = "bazel-lib-1.26.2", - url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v1.26.2.tar.gz", + sha256 = "0aed9a6e7612b2968b5aa1ac0f801f5ec956ec2c04810da2c1445cac34938596", + strip_prefix = "bazel-lib-1.29.0", + url = "https://github.com/aspect-build/bazel-lib/archive/refs/tags/v1.29.0.tar.gz", ) http_archive( From cb87d2f957a4ab0e4e8203c3ae6e59e7b2876a35 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 4 Jun 2023 13:03:25 +0200 Subject: [PATCH 3/7] chore: Update bazel_gazelle --- internal_deps.bzl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal_deps.bzl b/internal_deps.bzl index 550d2081..97a35c51 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -27,8 +27,8 @@ def rules_zig_internal_deps(): http_archive( name = "bazel_gazelle", - sha256 = "ecba0f04f96b4960a5b250c8e8eeec42281035970aa8852dda73098274d14a1d", - urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.29.0/bazel-gazelle-v0.29.0.tar.gz"], + sha256 = "727f3e4edd96ea20c29e8c2ca9e8d2af724d8c7778e7923a854b2c80952bc405", + urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.30.0/bazel-gazelle-v0.30.0.tar.gz"], ) http_file( From a77723d270feeca4f13baf9f72d126faf6a6a1b2 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 4 Jun 2023 13:04:03 +0200 Subject: [PATCH 4/7] chore: Update Bazel 6 version --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index cd71c98d..6326acce 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1,4 +1,4 @@ -6.0.0 +6.2.0 # The first line of this file is used by Bazelisk and Bazel to be sure # the right version of Bazel is used to build and test this repo. # This also defines which version is used on CI. From 34ced5d4a56826f08782aac2a9956fdc6507f5f2 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 4 Jun 2023 13:15:13 +0200 Subject: [PATCH 5/7] chore: Install Buildifier linter --- .pre-commit-config.yaml | 2 +- WORKSPACE | 9 +++++++++ internal_deps.bzl | 9 +++++++++ util/BUILD.bazel | 9 +++++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5b5bead6..e6cfa8b0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ default_language_version: repos: # Check formatting and lint for starlark code - repo: https://github.com/keith/pre-commit-buildifier - rev: 4.0.1.1 + rev: 6.1.0.1 hooks: - id: buildifier - id: buildifier-lint diff --git a/WORKSPACE b/WORKSPACE index 7a1e4b58..e92eda95 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -23,6 +23,15 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace") bazel_skylib_workspace() +# For buildifier linting +load("@buildifier_prebuilt//:deps.bzl", "buildifier_prebuilt_deps") + +buildifier_prebuilt_deps() + +load("@buildifier_prebuilt//:defs.bzl", "buildifier_prebuilt_register_toolchains") + +buildifier_prebuilt_register_toolchains() + # For running integration tests load("@contrib_rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies") diff --git a/internal_deps.bzl b/internal_deps.bzl index 97a35c51..25045343 100644 --- a/internal_deps.bzl +++ b/internal_deps.bzl @@ -62,6 +62,15 @@ def rules_zig_internal_deps(): url = "https://github.com/keith/rules_multirun/archive/73017d503a524a9de59a5339c1db9cc4860cec2a.tar.gz", ) + http_archive( + name = "buildifier_prebuilt", + sha256 = "e46c16180bc49487bfd0f1ffa7345364718c57334fa0b5b67cb5f27eba10f309", + strip_prefix = "buildifier-prebuilt-6.1.0", + urls = [ + "http://github.com/keith/buildifier-prebuilt/archive/6.1.0.tar.gz", + ], + ) + # Override bazel_skylib distribution to fetch sources instead # so that the gazelle extension is included # see https://github.com/bazelbuild/bazel-skylib/issues/250 diff --git a/util/BUILD.bazel b/util/BUILD.bazel index d8aad21b..689da1df 100644 --- a/util/BUILD.bazel +++ b/util/BUILD.bazel @@ -1,6 +1,15 @@ load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary") +load("@buildifier_prebuilt//:rules.bzl", "buildifier") load("@rules_multirun//:defs.bzl", "multirun") +buildifier( + name = "buildifier.check", + diff_command = "diff", + exclude_patterns = ["./.git/*"], + lint_mode = "warn", + mode = "diff", +) + multirun( name = "update", commands = [ From b400ad166f487a7a32bc83e7aff8fe78bcd4cc82 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 4 Jun 2023 13:21:58 +0200 Subject: [PATCH 6/7] chore: run buildifier test --- BUILD.bazel | 5 +++++ util/BUILD.bazel | 6 ++++-- zig/private/zig_configure.bzl | 6 ++---- zig/private/zig_package.bzl | 1 - zig/tests/package_info_test.bzl | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 9ee65a78..fc28d8db 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,5 +1,10 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library") +exports_files( + ["WORKSPACE"], + visibility = ["//util:__pkg__"], +) + bzl_library( name = "internal_deps", srcs = ["internal_deps.bzl"], diff --git a/util/BUILD.bazel b/util/BUILD.bazel index 689da1df..719af16b 100644 --- a/util/BUILD.bazel +++ b/util/BUILD.bazel @@ -1,13 +1,15 @@ load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary") -load("@buildifier_prebuilt//:rules.bzl", "buildifier") +load("@buildifier_prebuilt//:rules.bzl", "buildifier_test") load("@rules_multirun//:defs.bzl", "multirun") -buildifier( +buildifier_test( name = "buildifier.check", diff_command = "diff", exclude_patterns = ["./.git/*"], lint_mode = "warn", mode = "diff", + no_sandbox = True, + workspace = "//:WORKSPACE", ) multirun( diff --git a/zig/private/zig_configure.bzl b/zig/private/zig_configure.bzl index 4e2e3f69..4999fc31 100644 --- a/zig/private/zig_configure.bzl +++ b/zig/private/zig_configure.bzl @@ -122,7 +122,7 @@ _zig_transition = transition( ], ) -def _make_attrs(*, executable, test): +def _make_attrs(*, executable): return { "actual": attr.label( doc = "The target to transition.", @@ -154,11 +154,9 @@ _FORWARD_PROVIDERS = [ def _make_zig_configure_rule(*, executable, test): _executable = executable - _test = test def _zig_configure_impl(ctx): executable = _executable - test = _test if type(ctx.attr.actual) == "list": if len(ctx.attr.actual) == 1: @@ -213,7 +211,7 @@ def _make_zig_configure_rule(*, executable, test): return rule( _zig_configure_impl, - attrs = _make_attrs(executable = executable, test = test), + attrs = _make_attrs(executable = executable), doc = DOC + example, executable = executable, test = test, diff --git a/zig/private/zig_package.bzl b/zig/private/zig_package.bzl index f4236c28..70480ace 100644 --- a/zig/private/zig_package.bzl +++ b/zig/private/zig_package.bzl @@ -61,7 +61,6 @@ def _zig_package_impl(ctx): default = DefaultInfo( ) - description = (ctx.label.name, ctx.file.main) srcs = [ctx.file.main] + ctx.files.srcs flags = ["--pkg-begin", ctx.label.name, ctx.file.main.path] all_srcs = [] diff --git a/zig/tests/package_info_test.bzl b/zig/tests/package_info_test.bzl index ca9d0753..20115487 100644 --- a/zig/tests/package_info_test.bzl +++ b/zig/tests/package_info_test.bzl @@ -12,7 +12,7 @@ load( def _mock_args(): self_args = [] - def add_all(args, *, map_each = None): + def add_all(args): for arg in args: if type(arg) == "File": self_args.append(arg.path) From 316b2431067a77aa32a0b9b6247dd0c2b4fa5f46 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 4 Jun 2023 13:24:36 +0200 Subject: [PATCH 7/7] chore: run buildifier.fix in update --- util/BUILD.bazel | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/util/BUILD.bazel b/util/BUILD.bazel index 719af16b..dc8553ef 100644 --- a/util/BUILD.bazel +++ b/util/BUILD.bazel @@ -1,7 +1,15 @@ load("@bazel_gazelle//:def.bzl", "gazelle", "gazelle_binary") -load("@buildifier_prebuilt//:rules.bzl", "buildifier_test") +load("@buildifier_prebuilt//:rules.bzl", "buildifier", "buildifier_test") load("@rules_multirun//:defs.bzl", "multirun") +buildifier( + name = "buildifier.fix", + diff_command = "diff", + exclude_patterns = ["./.git/*"], + lint_mode = "fix", + mode = "fix", +) + buildifier_test( name = "buildifier.check", diff_command = "diff", @@ -19,6 +27,7 @@ multirun( ":update_filegroups", "//docs:update-alias", "@contrib_rules_bazel_integration_test//tools:update_deleted_packages", + ":buildifier.fix", ], )