Skip to content

Commit fa6d9b4

Browse files
authored
refactor: remove jq toolchain (#1186)
Follow-up promised in bazel-contrib/tar.bzl#37 The toolchain is ported in bazel-contrib/jq.bzl#31 Also remove assert_json_matches, this is now in jq.bzl: bazel-contrib/jq.bzl#30 BREAKING CHANGE: Anyone using the toolchain type themselves will have to get it from jq.bzl instead. This would only be an obscure case if users compiled their own jq from source, or wrote custom rules that take a jq toolchain to resolve a jq binary.
1 parent 49087eb commit fa6d9b4

File tree

10 files changed

+1
-348
lines changed

10 files changed

+1
-348
lines changed

.gitattributes

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# In code review, collapse generated files
2-
docs/*.md linguist-generated=true
3-
41
#################################
52
# Configuration for 'git archive'
63
# see https://git-scm.com/docs/git-archive#ATTRIBUTES

MODULE.bazel

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,22 @@ module(
77
# Lower-bounds (minimum) versions for direct runtime dependencies
88
bazel_dep(name = "bazel_features", version = "1.9.0")
99
bazel_dep(name = "bazel_skylib", version = "1.8.1")
10-
bazel_dep(name = "jq.bzl", version = "0.1.0")
1110
bazel_dep(name = "platforms", version = "0.0.10")
1211
bazel_dep(name = "stardoc", version = "0.7.1")
1312
bazel_dep(name = "rules_shell", version = "0.4.1")
1413

1514
bazel_lib_toolchains = use_extension("@bazel_lib//lib:extensions.bzl", "toolchains")
1615
bazel_lib_toolchains.copy_directory()
1716
bazel_lib_toolchains.copy_to_directory()
18-
bazel_lib_toolchains.jq()
1917
bazel_lib_toolchains.coreutils()
2018
bazel_lib_toolchains.zstd()
2119
bazel_lib_toolchains.expand_template()
2220
bazel_lib_toolchains.bats()
23-
use_repo(bazel_lib_toolchains, "bats_toolchains", "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "jq", "jq_toolchains", "zstd_toolchains")
21+
use_repo(bazel_lib_toolchains, "bats_toolchains", "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "zstd_toolchains")
2422

2523
register_toolchains(
2624
"@copy_directory_toolchains//:all",
2725
"@copy_to_directory_toolchains//:all",
28-
"@jq_toolchains//:all",
2926
"@coreutils_toolchains//:all",
3027
"@expand_template_toolchains//:all",
3128
"@bats_toolchains//:all",

e2e/api_entries/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ build_test(
2727
"@bazel_lib//lib:flag_bzlmod",
2828
"@bazel_lib//lib:glob_match",
2929
"@bazel_lib//lib:host_repo",
30-
"@bazel_lib//lib:jq_toolchain_type",
3130
"@bazel_lib//lib:lists",
3231
"@bazel_lib//lib:output_files",
3332
"@bazel_lib//lib:params_file",

e2e/run_jq_symlinked_bin.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

lib/BUILD.bazel

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ config_setting(
3939
values = {"enable_runfiles": "true"},
4040
)
4141

42-
toolchain_type(
43-
name = "jq_toolchain_type",
44-
)
45-
4642
toolchain_type(
4743
name = "copy_directory_toolchain_type",
4844
)
@@ -204,7 +200,6 @@ bzl_library(
204200
":utils",
205201
"@bazel_skylib//lib:types",
206202
"@bazel_skylib//rules:write_file",
207-
"@jq.bzl//jq:jq",
208203
"@rules_shell//shell:rules_bzl",
209204
],
210205
)
@@ -230,7 +225,6 @@ bzl_library(
230225
"//lib/private:copy_to_directory_toolchain",
231226
"//lib/private:coreutils_toolchain",
232227
"//lib/private:expand_template_toolchain",
233-
"//lib/private:jq_toolchain",
234228
"//lib/private:source_toolchains_repo",
235229
"//lib/private:zstd_toolchain",
236230
],

lib/extensions.bzl

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,12 @@ load(
1010
"DEFAULT_COREUTILS_REPOSITORY",
1111
"DEFAULT_COREUTILS_VERSION",
1212
"DEFAULT_EXPAND_TEMPLATE_REPOSITORY",
13-
"DEFAULT_JQ_REPOSITORY",
14-
"DEFAULT_JQ_VERSION",
1513
"DEFAULT_ZSTD_REPOSITORY",
1614
"register_bats_toolchains",
1715
"register_copy_directory_toolchains",
1816
"register_copy_to_directory_toolchains",
1917
"register_coreutils_toolchains",
2018
"register_expand_template_toolchains",
21-
"register_jq_toolchains",
2219
"register_zstd_toolchains",
2320
)
2421
load("//lib/private:extension_utils.bzl", "extension_utils")
@@ -57,13 +54,6 @@ def _toolchains_extension_impl(mctx):
5754
get_version_fn = lambda attr: None,
5855
)
5956

60-
extension_utils.toolchain_repos_bfs(
61-
mctx = mctx,
62-
get_tag_fn = lambda tags: tags.jq,
63-
toolchain_name = "jq",
64-
toolchain_repos_fn = lambda name, version: register_jq_toolchains(name = name, version = version, register = False),
65-
)
66-
6757
extension_utils.toolchain_repos_bfs(
6858
mctx = mctx,
6959
get_tag_fn = lambda tags: tags.coreutils,
@@ -107,7 +97,6 @@ toolchains = module_extension(
10797
tag_classes = {
10898
"copy_directory": tag_class(attrs = {"name": attr.string(default = DEFAULT_COPY_DIRECTORY_REPOSITORY)}),
10999
"copy_to_directory": tag_class(attrs = {"name": attr.string(default = DEFAULT_COPY_TO_DIRECTORY_REPOSITORY)}),
110-
"jq": tag_class(attrs = {"name": attr.string(default = DEFAULT_JQ_REPOSITORY), "version": attr.string(default = DEFAULT_JQ_VERSION)}),
111100
"coreutils": tag_class(attrs = {"name": attr.string(default = DEFAULT_COREUTILS_REPOSITORY), "version": attr.string(default = DEFAULT_COREUTILS_VERSION)}),
112101
"zstd": tag_class(attrs = {"name": attr.string(default = DEFAULT_ZSTD_REPOSITORY)}),
113102
"expand_template": tag_class(attrs = {"name": attr.string(default = DEFAULT_EXPAND_TEMPLATE_REPOSITORY)}),

lib/private/BUILD.bazel

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,13 +157,6 @@ bzl_library(
157157
],
158158
)
159159

160-
bzl_library(
161-
name = "jq_toolchain",
162-
srcs = ["jq_toolchain.bzl"],
163-
visibility = ["//lib:__subpackages__"],
164-
deps = [":repo_utils"],
165-
)
166-
167160
bzl_library(
168161
name = "output_files",
169162
srcs = ["output_files.bzl"],

lib/private/jq_toolchain.bzl

Lines changed: 0 additions & 223 deletions
This file was deleted.

0 commit comments

Comments
 (0)