Skip to content

Commit

Permalink
fix: declare copy_to_bin toolchains for bazel-lib 2.0 compat (#75)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexeagle authored Dec 7, 2023
1 parent 09a3c95 commit 94acce4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module(
compatibility_level = 1,
)

bazel_dep(name = "aspect_bazel_lib", version = "1.36.0")
bazel_dep(name = "aspect_bazel_lib", version = "1.38.0")

# Needed in the root because we use js_lib_helpers in our aspect impl
bazel_dep(name = "aspect_rules_js", version = "1.32.6")
Expand Down
2 changes: 1 addition & 1 deletion example/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"Bazel dependencies"

bazel_dep(name = "aspect_rules_lint", version = "0.0.0")
bazel_dep(name = "aspect_bazel_lib", version = "1.36.0")
bazel_dep(name = "aspect_bazel_lib", version = "1.38.0")
bazel_dep(name = "aspect_rules_js", version = "1.32.6")
bazel_dep(name = "aspect_rules_ts", version = "1.3.3")
bazel_dep(name = "rules_buf", version = "0.2.0")
Expand Down
7 changes: 7 additions & 0 deletions example/WORKSPACE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@ load("@pip//:requirements.bzl", "install_deps")

install_deps()

http_archive(
name = "aspect_bazel_lib",
sha256 = "b848cd8e93be7f18c3deda6d2f3ade92a657d3585e119953bc50dc75fef535c2",
strip_prefix = "bazel-lib-1.38.0",
url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.38.0/bazel-lib-v1.38.0.tar.gz",
)

http_archive(
name = "aspect_rules_js",
sha256 = "7ab9776bcca823af361577a1a2ebb9a30d2eb5b94ecc964b8be360f443f714b2",
Expand Down
3 changes: 2 additions & 1 deletion lint/eslint.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ eslint = eslint_aspect(
```
"""

load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_files_to_bin_actions")
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "COPY_FILE_TO_BIN_TOOLCHAINS", "copy_files_to_bin_actions")
load("@aspect_rules_js//js:libs.bzl", "js_lib_helpers")
load("//lint/private:lint_aspect.bzl", "report_file")

Expand Down Expand Up @@ -129,4 +129,5 @@ def eslint_aspect(binary, configs):
cfg = "exec",
),
},
toolchains = COPY_FILE_TO_BIN_TOOLCHAINS,
)

0 comments on commit 94acce4

Please sign in to comment.