From a110f953cde7beaf1e43f99d20c930c006971551 Mon Sep 17 00:00:00 2001 From: "publish-to-bcr-bot[bot]" <112732530+publish-to-bcr-bot[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 12:30:54 -0800 Subject: [PATCH] aspect_bazel_lib@2.5.3 (#1601) Release: https://github.com/aspect-build/bazel-lib/releases/tag/v2.5.3 Author: @kormide fyi: @alexeagle _Automated by [Publish to BCR](https://github.com/apps/publish-to-bcr)_ Co-authored-by: Derek Cormier --- modules/aspect_bazel_lib/2.5.3/MODULE.bazel | 80 +++++++++++++++++++ .../2.5.3/patches/go_dev_dep.patch | 27 +++++++ .../patches/module_dot_bazel_version.patch | 14 ++++ modules/aspect_bazel_lib/2.5.3/presubmit.yml | 12 +++ modules/aspect_bazel_lib/2.5.3/source.json | 10 +++ modules/aspect_bazel_lib/metadata.json | 3 +- 6 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 modules/aspect_bazel_lib/2.5.3/MODULE.bazel create mode 100644 modules/aspect_bazel_lib/2.5.3/patches/go_dev_dep.patch create mode 100644 modules/aspect_bazel_lib/2.5.3/patches/module_dot_bazel_version.patch create mode 100644 modules/aspect_bazel_lib/2.5.3/presubmit.yml create mode 100644 modules/aspect_bazel_lib/2.5.3/source.json diff --git a/modules/aspect_bazel_lib/2.5.3/MODULE.bazel b/modules/aspect_bazel_lib/2.5.3/MODULE.bazel new file mode 100644 index 0000000000..a0f9846a7a --- /dev/null +++ b/modules/aspect_bazel_lib/2.5.3/MODULE.bazel @@ -0,0 +1,80 @@ +"aspect-build/bazel-lib" + +module( + name = "aspect_bazel_lib", + version = "2.5.3", + bazel_compatibility = [">=6.0.0"], + compatibility_level = 1, +) + +# Lower-bound versions of our dependencies +bazel_dep(name = "bazel_skylib", version = "1.5.0") +bazel_dep(name = "platforms", version = "0.0.8") + +# 0.5.4 is the first version with bzlmod support +bazel_dep(name = "stardoc", version = "0.5.4", repo_name = "io_bazel_stardoc") + +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.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_toolchains", "yq_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", + # Expand bsd_tar_toolchains + "@bsd_tar_toolchains//:linux_amd64_toolchain", + "@bsd_tar_toolchains//:linux_arm64_toolchain", + "@bsd_tar_toolchains//:windows_amd64_toolchain", + # host toolchain must be last, as it's only suitable as a fallback on macos + "@bsd_tar_toolchains//:host_toolchain", +) + +host = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "host", dev_dependency = True) +host.host() +use_repo(host, "aspect_bazel_lib_host") + +# 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 = "gazelle", + version = "0.33.0", + dev_dependency = True, +) +bazel_dep( + name = "rules_go", + version = "0.41.0", + repo_name = "io_bazel_rules_go", + dev_dependency = True, +) + +go_deps = use_extension( + "@gazelle//:extensions.bzl", + "go_deps", + dev_dependency = True, +) +go_deps.from_file(go_mod = "//:go.mod") +use_repo( + go_deps, + "com_github_bmatcuk_doublestar_v4", + "org_golang_x_exp", +) + +# Development-only dependencies + +bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True) +bazel_dep(name = "buildifier_prebuilt", version = "6.3.3", dev_dependency = True) +bazel_dep(name = "bazel_features", version = "0.2.0", dev_dependency = True) diff --git a/modules/aspect_bazel_lib/2.5.3/patches/go_dev_dep.patch b/modules/aspect_bazel_lib/2.5.3/patches/go_dev_dep.patch new file mode 100644 index 0000000000..1ade7b2c6d --- /dev/null +++ b/modules/aspect_bazel_lib/2.5.3/patches/go_dev_dep.patch @@ -0,0 +1,27 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index e63fa5b..9d78a88 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -50,19 +50,19 @@ use_repo(host, "aspect_bazel_lib_host") + bazel_dep( + name = "gazelle", + version = "0.33.0", +- # In released versions: dev_dependency = True ++ dev_dependency = True, + ) + bazel_dep( + name = "rules_go", + version = "0.41.0", + repo_name = "io_bazel_rules_go", +- # In released versions: dev_dependency = True ++ dev_dependency = True, + ) + + go_deps = use_extension( + "@gazelle//:extensions.bzl", + "go_deps", +- # In released versions: dev_dependency = True ++ dev_dependency = True, + ) + go_deps.from_file(go_mod = "//:go.mod") + use_repo( diff --git a/modules/aspect_bazel_lib/2.5.3/patches/module_dot_bazel_version.patch b/modules/aspect_bazel_lib/2.5.3/patches/module_dot_bazel_version.patch new file mode 100644 index 0000000000..6a1c6aba6c --- /dev/null +++ b/modules/aspect_bazel_lib/2.5.3/patches/module_dot_bazel_version.patch @@ -0,0 +1,14 @@ +=================================================================== +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -1,9 +1,9 @@ + "aspect-build/bazel-lib" + + module( + name = "aspect_bazel_lib", +- version = "0.0.0", ++ version = "2.5.3", + bazel_compatibility = [">=6.0.0"], + compatibility_level = 1, + ) + diff --git a/modules/aspect_bazel_lib/2.5.3/presubmit.yml b/modules/aspect_bazel_lib/2.5.3/presubmit.yml new file mode 100644 index 0000000000..e63a5721ca --- /dev/null +++ b/modules/aspect_bazel_lib/2.5.3/presubmit.yml @@ -0,0 +1,12 @@ +bcr_test_module: + module_path: "e2e/smoke" + matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + bazel: ["7.x", "6.x"] + tasks: + run_tests: + name: "Run test module" + platform: ${{ platform }} + bazel: ${{ bazel }} + test_targets: + - "//..." diff --git a/modules/aspect_bazel_lib/2.5.3/source.json b/modules/aspect_bazel_lib/2.5.3/source.json new file mode 100644 index 0000000000..162e4bef2e --- /dev/null +++ b/modules/aspect_bazel_lib/2.5.3/source.json @@ -0,0 +1,10 @@ +{ + "integrity": "sha256-bCXFlYEEHt4x4RdpMEf5csxHAMiaz5E2WNyJ0Ewzj40=", + "strip_prefix": "bazel-lib-2.5.3", + "url": "https://github.com/aspect-build/bazel-lib/releases/download/v2.5.3/bazel-lib-v2.5.3.tar.gz", + "patches": { + "go_dev_dep.patch": "sha256-KgABwDzOT+DugUHn9tHLOz05osnk2FLsS10d5zqG/M0=", + "module_dot_bazel_version.patch": "sha256-lJcPl3qi//Az5K9CO6WnDIL8gtJVzpOWhyailCiKeVY=" + }, + "patch_strip": 1 +} diff --git a/modules/aspect_bazel_lib/metadata.json b/modules/aspect_bazel_lib/metadata.json index 9eb487cc0d..b25378ec9f 100644 --- a/modules/aspect_bazel_lib/metadata.json +++ b/modules/aspect_bazel_lib/metadata.json @@ -109,7 +109,8 @@ "2.4.2", "2.5.0", "2.5.1", - "2.5.2" + "2.5.2", + "2.5.3" ], "yanked_versions": { "1.31.0": "1.31.0 has a breaking change to the default yq version",