From a3afa081616d43ef6346bdf5054d25318c98d11a Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Fri, 31 May 2024 15:08:52 -0700 Subject: [PATCH] chore(bazel): bump to aspect_bazel_lib 2.7.7 (#63012) --- .aspect/bazelrc/javascript.bazelrc | 1 + WORKSPACE | 12 ++++++------ dev/eslint.bzl | 5 +++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.aspect/bazelrc/javascript.bazelrc b/.aspect/bazelrc/javascript.bazelrc index 474ec632d06..ace9d6040da 100644 --- a/.aspect/bazelrc/javascript.bazelrc +++ b/.aspect/bazelrc/javascript.bazelrc @@ -8,3 +8,4 @@ # details. # Docs: https://nodejs.org/en/docs/guides/debugging-getting-started/#command-line-options run:debug -- --node_options=--inspect-brk +test:debug --test_env=NODE_OPTIONS=--inspect-brk diff --git a/WORKSPACE b/WORKSPACE index 3a363fc2ad6..0a50220afda 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -28,9 +28,9 @@ bazel_skylib_workspace() http_archive( name = "aspect_bazel_lib", - sha256 = "d0529773764ac61184eb3ad3c687fb835df5bee01afedf07f0cf1a45515c96bc", - strip_prefix = "bazel-lib-1.42.3", - url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.42.3/bazel-lib-v1.42.3.tar.gz", + sha256 = "6d758a8f646ecee7a3e294fbe4386daafbe0e5966723009c290d493f227c390b", + strip_prefix = "bazel-lib-2.7.7", + url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.7/bazel-lib-v2.7.7.tar.gz", ) # rules_js defines an older rules_nodejs, so we override it here @@ -156,11 +156,11 @@ http_archive( url = "https://github.com/aspect-build/aspect-cli/archive/5.8.20.tar.gz", ) -load("@aspect_bazel_lib//lib:repositories.bzl", "register_expand_template_toolchains", "register_jq_toolchains") +load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies", "aspect_bazel_lib_register_toolchains") -register_jq_toolchains() +aspect_bazel_lib_dependencies() -register_expand_template_toolchains() +aspect_bazel_lib_register_toolchains() http_archive( name = "rules_apko", diff --git a/dev/eslint.bzl b/dev/eslint.bzl index f58206675b0..f6dbba16a5e 100644 --- a/dev/eslint.bzl +++ b/dev/eslint.bzl @@ -1,7 +1,7 @@ -load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_files_to_bin_actions") -load("//dev:js_lib.bzl", "gather_files_from_js_providers", "gather_runfiles") +load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "COPY_FILE_TO_BIN_TOOLCHAINS", "copy_files_to_bin_actions") load("@aspect_rules_js//js:defs.bzl", "js_library") load("@aspect_rules_js//js:providers.bzl", "JsInfo") +load("//dev:js_lib.bzl", "gather_files_from_js_providers", "gather_runfiles") def eslint_config_and_lint_root(name = "eslint_config", config_deps = [], root_js_deps = []): """ @@ -147,6 +147,7 @@ _eslint_test_with_types = rule( "binary": attr.label(executable = True, cfg = "exec", allow_files = True), "report": attr.string(), }, + toolchains = COPY_FILE_TO_BIN_TOOLCHAINS, ) def eslint_test_with_types(name, **kwargs):