diff --git a/modules/aspect_bazel_lib/2.16.0.envoy/MODULE.bazel b/modules/aspect_bazel_lib/2.16.0.envoy/MODULE.bazel deleted file mode 100644 index 80b0088..0000000 --- a/modules/aspect_bazel_lib/2.16.0.envoy/MODULE.bazel +++ /dev/null @@ -1,52 +0,0 @@ -"aspect-build/bazel-lib" - -module( - name = "aspect_bazel_lib", - bazel_compatibility = [">=6.5.0"], - compatibility_level = 1, - version = "2.16.0.envoy", -) - -# Lower-bounds (minimum) versions for direct runtime dependencies -bazel_dep(name = "bazel_features", version = "1.9.0") -bazel_dep(name = "bazel_skylib", version = "1.8.1") -bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "stardoc", version = "0.7.1") -bazel_dep(name = "rules_shell", version = "0.4.1") - -# TODO(3.0): remove this back-compat -bazel_dep(name = "jq.bzl", version = "0.1.0") -bazel_dep(name = "yq.bzl", version = "0.1.1") -bazel_dep(name = "tar.bzl", version = "0.5.1") - -bazel_lib_toolchains = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") -bazel_lib_toolchains.copy_directory() -bazel_lib_toolchains.copy_to_directory() -bazel_lib_toolchains.jq() -bazel_lib_toolchains.yq() -bazel_lib_toolchains.coreutils() -bazel_lib_toolchains.tar() -bazel_lib_toolchains.zstd() -bazel_lib_toolchains.expand_template() -bazel_lib_toolchains.bats() -use_repo(bazel_lib_toolchains, "bats_toolchains", "bsd_tar_toolchains", "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "jq", "jq_toolchains", "yq", "yq_toolchains", "zstd_toolchains") - -register_toolchains( - "@copy_directory_toolchains//:all", - "@copy_to_directory_toolchains//:all", - "@jq_toolchains//:all", - "@yq_toolchains//:all", - "@coreutils_toolchains//:all", - "@expand_template_toolchains//:all", - "@bats_toolchains//:all", - "@bsd_tar_toolchains//:all", - "@zstd_toolchains//:all", -) - -####### Dev dependencies ######## - -# To allow /tools to be built from source -# NOTE: when publishing to BCR, we patch this to be dev_dependency, as we publish pre-built binaries -# along with our releases. -bazel_dep(name = "rules_go", version = "0.50.1", dev_dependency = True, repo_name = "io_bazel_rules_go") -bazel_dep(name = "gazelle", version = "0.41.1", dev_dependency = True, repo_name = "bazel_gazelle") diff --git a/modules/aspect_bazel_lib/2.16.0.envoy/overlay/MODULE.bazel b/modules/aspect_bazel_lib/2.16.0.envoy/overlay/MODULE.bazel deleted file mode 100644 index 80b0088..0000000 --- a/modules/aspect_bazel_lib/2.16.0.envoy/overlay/MODULE.bazel +++ /dev/null @@ -1,52 +0,0 @@ -"aspect-build/bazel-lib" - -module( - name = "aspect_bazel_lib", - bazel_compatibility = [">=6.5.0"], - compatibility_level = 1, - version = "2.16.0.envoy", -) - -# Lower-bounds (minimum) versions for direct runtime dependencies -bazel_dep(name = "bazel_features", version = "1.9.0") -bazel_dep(name = "bazel_skylib", version = "1.8.1") -bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "stardoc", version = "0.7.1") -bazel_dep(name = "rules_shell", version = "0.4.1") - -# TODO(3.0): remove this back-compat -bazel_dep(name = "jq.bzl", version = "0.1.0") -bazel_dep(name = "yq.bzl", version = "0.1.1") -bazel_dep(name = "tar.bzl", version = "0.5.1") - -bazel_lib_toolchains = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") -bazel_lib_toolchains.copy_directory() -bazel_lib_toolchains.copy_to_directory() -bazel_lib_toolchains.jq() -bazel_lib_toolchains.yq() -bazel_lib_toolchains.coreutils() -bazel_lib_toolchains.tar() -bazel_lib_toolchains.zstd() -bazel_lib_toolchains.expand_template() -bazel_lib_toolchains.bats() -use_repo(bazel_lib_toolchains, "bats_toolchains", "bsd_tar_toolchains", "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "jq", "jq_toolchains", "yq", "yq_toolchains", "zstd_toolchains") - -register_toolchains( - "@copy_directory_toolchains//:all", - "@copy_to_directory_toolchains//:all", - "@jq_toolchains//:all", - "@yq_toolchains//:all", - "@coreutils_toolchains//:all", - "@expand_template_toolchains//:all", - "@bats_toolchains//:all", - "@bsd_tar_toolchains//:all", - "@zstd_toolchains//:all", -) - -####### Dev dependencies ######## - -# To allow /tools to be built from source -# NOTE: when publishing to BCR, we patch this to be dev_dependency, as we publish pre-built binaries -# along with our releases. -bazel_dep(name = "rules_go", version = "0.50.1", dev_dependency = True, repo_name = "io_bazel_rules_go") -bazel_dep(name = "gazelle", version = "0.41.1", dev_dependency = True, repo_name = "bazel_gazelle") diff --git a/modules/aspect_bazel_lib/2.16.0.envoy/patches/aspect.patch b/modules/aspect_bazel_lib/2.16.0.envoy/patches/aspect.patch deleted file mode 100644 index b9047da..0000000 --- a/modules/aspect_bazel_lib/2.16.0.envoy/patches/aspect.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/lib/private/yq.bzl b/lib/private/yq.bzl -index 29ca3d7..c8cd5eb 100644 ---- a/lib/private/yq.bzl -+++ b/lib/private/yq.bzl -@@ -71,10 +71,13 @@ def _yq_impl(ctx): - - # For split operations, yq outputs files in the same directory so we - # must cd to the correct output dir before executing it -- bin_dir = "/".join([ctx.bin_dir.path, ctx.label.package]) if ctx.label.package else ctx.bin_dir.path -+ bin_dir = ctx.bin_dir.path -+ if ctx.label.workspace_name: -+ bin_dir = "%s/external/%s" % (bin_dir, ctx.label.workspace_name) -+ bin_dir = "/".join([bin_dir, ctx.label.package]) if ctx.label.package else bin_dir - escape_bin_dir = _escape_path(bin_dir) - cmd = "cd {bin_dir} && {yq} {args} {eval_cmd} {expression} {sources} {maybe_out}".format( -- bin_dir = ctx.bin_dir.path + "/" + ctx.label.package, -+ bin_dir = bin_dir, - yq = escape_bin_dir + yq_bin.path, - eval_cmd = "eval" if len(inputs) <= 1 else "eval-all", - args = " ".join(args), diff --git a/modules/aspect_bazel_lib/2.16.0.envoy/presubmit.yml b/modules/aspect_bazel_lib/2.16.0.envoy/presubmit.yml deleted file mode 100644 index 89ca7c8..0000000 --- a/modules/aspect_bazel_lib/2.16.0.envoy/presubmit.yml +++ /dev/null @@ -1,19 +0,0 @@ -matrix: - platform: - - debian11 - - macos - - ubuntu2404 - bazel: - - 8.x - -tasks: - verify_targets: - platform: ${{ platform }} - bazel: ${{ bazel }} - build_targets: - - "@aspect_bazel_lib//lib:lib" - - "@aspect_bazel_lib//lib:copy_to_directory" - - "@aspect_bazel_lib//lib:copy_directory" - - "@aspect_bazel_lib//lib:jq" - - "@aspect_bazel_lib//lib:yq" - - "@aspect_bazel_lib//lib:tar" diff --git a/modules/aspect_bazel_lib/2.16.0.envoy/source.json b/modules/aspect_bazel_lib/2.16.0.envoy/source.json deleted file mode 100644 index b48bf41..0000000 --- a/modules/aspect_bazel_lib/2.16.0.envoy/source.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "integrity": "sha256-CS+EHdnqjnNuqDTzBId6JRkKdi0PCmyO2sn5SqyLvxY=", - "strip_prefix": "bazel-lib-2.16.0", - "url": "https://github.com/aspect-build/bazel-lib/archive/v2.16.0.tar.gz", - "patch_strip": 1, - "patches": { - "aspect.patch": "sha256-bBrJAHyNBWppp9t9PUGt/fpFdGf+HepS40N/1tvRzAo=" - }, - "overlay": { - "MODULE.bazel": "sha256-eMQc7A3JTG6OuPahTNUjklgPCigj30I8RPG+036xCgA=" - } -} diff --git a/modules/aspect_bazel_lib/2.21.2.envoy/MODULE.bazel b/modules/aspect_bazel_lib/2.21.2.envoy/MODULE.bazel deleted file mode 100644 index 2cfb84b..0000000 --- a/modules/aspect_bazel_lib/2.21.2.envoy/MODULE.bazel +++ /dev/null @@ -1,52 +0,0 @@ -"aspect-build/bazel-lib" - -module( - name = "aspect_bazel_lib", - bazel_compatibility = [">=6.5.0"], - compatibility_level = 1, - version = "2.21.2.envoy", -) - -# Lower-bounds (minimum) versions for direct runtime dependencies -bazel_dep(name = "bazel_features", version = "1.9.0") -bazel_dep(name = "bazel_skylib", version = "1.8.1") -bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "stardoc", version = "0.7.1") -bazel_dep(name = "rules_shell", version = "0.4.1") - -# TODO(3.0): remove this back-compat -bazel_dep(name = "jq.bzl", version = "0.1.0") -bazel_dep(name = "yq.bzl", version = "0.1.1") -bazel_dep(name = "tar.bzl", version = "0.5.1") - -bazel_lib_toolchains = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") -bazel_lib_toolchains.copy_directory() -bazel_lib_toolchains.copy_to_directory() -bazel_lib_toolchains.jq() -bazel_lib_toolchains.yq() -bazel_lib_toolchains.coreutils() -bazel_lib_toolchains.tar() -bazel_lib_toolchains.zstd() -bazel_lib_toolchains.expand_template() -bazel_lib_toolchains.bats() -use_repo(bazel_lib_toolchains, "bats_toolchains", "bsd_tar_toolchains", "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "jq", "jq_toolchains", "yq", "yq_toolchains", "zstd_toolchains") - -register_toolchains( - "@copy_directory_toolchains//:all", - "@copy_to_directory_toolchains//:all", - "@jq_toolchains//:all", - "@yq_toolchains//:all", - "@coreutils_toolchains//:all", - "@expand_template_toolchains//:all", - "@bats_toolchains//:all", - "@bsd_tar_toolchains//:all", - "@zstd_toolchains//:all", -) - -####### Dev dependencies ######## - -# To allow /tools to be built from source -# NOTE: when publishing to BCR, we patch this to be dev_dependency, as we publish pre-built binaries -# along with our releases. -bazel_dep(name = "rules_go", version = "0.50.1", dev_dependency = True, repo_name = "io_bazel_rules_go") -bazel_dep(name = "gazelle", version = "0.41.1", dev_dependency = True, repo_name = "bazel_gazelle") diff --git a/modules/aspect_bazel_lib/2.21.2.envoy/overlay/MODULE.bazel b/modules/aspect_bazel_lib/2.21.2.envoy/overlay/MODULE.bazel deleted file mode 100644 index 2cfb84b..0000000 --- a/modules/aspect_bazel_lib/2.21.2.envoy/overlay/MODULE.bazel +++ /dev/null @@ -1,52 +0,0 @@ -"aspect-build/bazel-lib" - -module( - name = "aspect_bazel_lib", - bazel_compatibility = [">=6.5.0"], - compatibility_level = 1, - version = "2.21.2.envoy", -) - -# Lower-bounds (minimum) versions for direct runtime dependencies -bazel_dep(name = "bazel_features", version = "1.9.0") -bazel_dep(name = "bazel_skylib", version = "1.8.1") -bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "stardoc", version = "0.7.1") -bazel_dep(name = "rules_shell", version = "0.4.1") - -# TODO(3.0): remove this back-compat -bazel_dep(name = "jq.bzl", version = "0.1.0") -bazel_dep(name = "yq.bzl", version = "0.1.1") -bazel_dep(name = "tar.bzl", version = "0.5.1") - -bazel_lib_toolchains = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains") -bazel_lib_toolchains.copy_directory() -bazel_lib_toolchains.copy_to_directory() -bazel_lib_toolchains.jq() -bazel_lib_toolchains.yq() -bazel_lib_toolchains.coreutils() -bazel_lib_toolchains.tar() -bazel_lib_toolchains.zstd() -bazel_lib_toolchains.expand_template() -bazel_lib_toolchains.bats() -use_repo(bazel_lib_toolchains, "bats_toolchains", "bsd_tar_toolchains", "copy_directory_toolchains", "copy_to_directory_toolchains", "coreutils_toolchains", "expand_template_toolchains", "jq", "jq_toolchains", "yq", "yq_toolchains", "zstd_toolchains") - -register_toolchains( - "@copy_directory_toolchains//:all", - "@copy_to_directory_toolchains//:all", - "@jq_toolchains//:all", - "@yq_toolchains//:all", - "@coreutils_toolchains//:all", - "@expand_template_toolchains//:all", - "@bats_toolchains//:all", - "@bsd_tar_toolchains//:all", - "@zstd_toolchains//:all", -) - -####### Dev dependencies ######## - -# To allow /tools to be built from source -# NOTE: when publishing to BCR, we patch this to be dev_dependency, as we publish pre-built binaries -# along with our releases. -bazel_dep(name = "rules_go", version = "0.50.1", dev_dependency = True, repo_name = "io_bazel_rules_go") -bazel_dep(name = "gazelle", version = "0.41.1", dev_dependency = True, repo_name = "bazel_gazelle") diff --git a/modules/aspect_bazel_lib/2.21.2.envoy/patches/aspect.patch b/modules/aspect_bazel_lib/2.21.2.envoy/patches/aspect.patch deleted file mode 100644 index b9047da..0000000 --- a/modules/aspect_bazel_lib/2.21.2.envoy/patches/aspect.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/lib/private/yq.bzl b/lib/private/yq.bzl -index 29ca3d7..c8cd5eb 100644 ---- a/lib/private/yq.bzl -+++ b/lib/private/yq.bzl -@@ -71,10 +71,13 @@ def _yq_impl(ctx): - - # For split operations, yq outputs files in the same directory so we - # must cd to the correct output dir before executing it -- bin_dir = "/".join([ctx.bin_dir.path, ctx.label.package]) if ctx.label.package else ctx.bin_dir.path -+ bin_dir = ctx.bin_dir.path -+ if ctx.label.workspace_name: -+ bin_dir = "%s/external/%s" % (bin_dir, ctx.label.workspace_name) -+ bin_dir = "/".join([bin_dir, ctx.label.package]) if ctx.label.package else bin_dir - escape_bin_dir = _escape_path(bin_dir) - cmd = "cd {bin_dir} && {yq} {args} {eval_cmd} {expression} {sources} {maybe_out}".format( -- bin_dir = ctx.bin_dir.path + "/" + ctx.label.package, -+ bin_dir = bin_dir, - yq = escape_bin_dir + yq_bin.path, - eval_cmd = "eval" if len(inputs) <= 1 else "eval-all", - args = " ".join(args), diff --git a/modules/aspect_bazel_lib/2.21.2.envoy/presubmit.yml b/modules/aspect_bazel_lib/2.21.2.envoy/presubmit.yml deleted file mode 100644 index 89ca7c8..0000000 --- a/modules/aspect_bazel_lib/2.21.2.envoy/presubmit.yml +++ /dev/null @@ -1,19 +0,0 @@ -matrix: - platform: - - debian11 - - macos - - ubuntu2404 - bazel: - - 8.x - -tasks: - verify_targets: - platform: ${{ platform }} - bazel: ${{ bazel }} - build_targets: - - "@aspect_bazel_lib//lib:lib" - - "@aspect_bazel_lib//lib:copy_to_directory" - - "@aspect_bazel_lib//lib:copy_directory" - - "@aspect_bazel_lib//lib:jq" - - "@aspect_bazel_lib//lib:yq" - - "@aspect_bazel_lib//lib:tar" diff --git a/modules/aspect_bazel_lib/2.21.2.envoy/source.json b/modules/aspect_bazel_lib/2.21.2.envoy/source.json deleted file mode 100644 index 7868ea3..0000000 --- a/modules/aspect_bazel_lib/2.21.2.envoy/source.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "integrity": "sha256-U8reqRCeZGqT7U3JDJu8qoBzx8PfdFuS9qUADa96o9o=", - "strip_prefix": "bazel-lib-2.21.2", - "url": "https://github.com/bazel-contrib/bazel-lib/releases/download/v2.21.2/bazel-lib-v2.21.2.tar.gz", - "patch_strip": 1, - "patches": { - "aspect.patch": "sha256-bBrJAHyNBWppp9t9PUGt/fpFdGf+HepS40N/1tvRzAo=" - }, - "overlay": { - "MODULE.bazel": "sha256-YwD4Ko2NSkiS2glxv3qzR7j7Cdv2FqOckS9I3QqYxhg=" - } -} diff --git a/modules/aspect_bazel_lib/metadata.json b/modules/aspect_bazel_lib/metadata.json deleted file mode 100644 index 0f60afd..0000000 --- a/modules/aspect_bazel_lib/metadata.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "homepage": "https://github.com/bazel-contrib/bazel-lib", - "maintainers": [], - "repository": [ - "github:bazel-contrib/bazel-lib" - ], - "versions": [ - "2.21.2.envoy" - ], - "yanked_versions": {} -}