From 7d31240caa17265b4abbab9be927a908286aba21 Mon Sep 17 00:00:00 2001 From: "publish-to-bcr-bot[bot]" <112732530+publish-to-bcr-bot[bot]@users.noreply.github.com> Date: Wed, 27 Sep 2023 18:16:37 +0000 Subject: [PATCH] Publish aspect-build/bazel-lib@v1.35.0 (#957) Co-authored-by: Derek Cormier --- modules/aspect_bazel_lib/1.35.0/MODULE.bazel | 45 +++++++++++++++++++ .../1.35.0/patches/go_dev_dep.patch | 16 +++++++ .../patches/module_dot_bazel_version.patch | 14 ++++++ modules/aspect_bazel_lib/1.35.0/presubmit.yml | 10 +++++ modules/aspect_bazel_lib/1.35.0/source.json | 10 +++++ modules/aspect_bazel_lib/metadata.json | 3 +- 6 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 modules/aspect_bazel_lib/1.35.0/MODULE.bazel create mode 100644 modules/aspect_bazel_lib/1.35.0/patches/go_dev_dep.patch create mode 100644 modules/aspect_bazel_lib/1.35.0/patches/module_dot_bazel_version.patch create mode 100644 modules/aspect_bazel_lib/1.35.0/presubmit.yml create mode 100644 modules/aspect_bazel_lib/1.35.0/source.json diff --git a/modules/aspect_bazel_lib/1.35.0/MODULE.bazel b/modules/aspect_bazel_lib/1.35.0/MODULE.bazel new file mode 100644 index 00000000000..08e027e24ce --- /dev/null +++ b/modules/aspect_bazel_lib/1.35.0/MODULE.bazel @@ -0,0 +1,45 @@ +"aspect-build/bazel-lib" + +module( + name = "aspect_bazel_lib", + version = "1.35.0", + compatibility_level = 1, +) + +# Lower-bound versions of our dependencies +bazel_dep(name = "bazel_skylib", version = "1.4.2") +bazel_dep(name = "platforms", version = "0.0.7") + +# 0.5.4 is the first version with bzlmod support +bazel_dep(name = "stardoc", version = "0.5.4", repo_name = "io_bazel_stardoc") + +ext = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "ext") +use_repo(ext, "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", +) + +# 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.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.4.1", dev_dependency = True) +bazel_dep(name = "buildifier_prebuilt", version = "6.1.0", dev_dependency = True) +bazel_dep(name = "gazelle", version = "0.33.0", dev_dependency = True) diff --git a/modules/aspect_bazel_lib/1.35.0/patches/go_dev_dep.patch b/modules/aspect_bazel_lib/1.35.0/patches/go_dev_dep.patch new file mode 100644 index 00000000000..e20f3a18cb8 --- /dev/null +++ b/modules/aspect_bazel_lib/1.35.0/patches/go_dev_dep.patch @@ -0,0 +1,16 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index f05c57a..4cb6104 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -28,9 +28,9 @@ register_toolchains( + # 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.41.0", repo_name = "io_bazel_rules_go") ++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") ++go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps", dev_dependency = True) + go_deps.from_file(go_mod = "//:go.mod") + use_repo( + go_deps, diff --git a/modules/aspect_bazel_lib/1.35.0/patches/module_dot_bazel_version.patch b/modules/aspect_bazel_lib/1.35.0/patches/module_dot_bazel_version.patch new file mode 100644 index 00000000000..c4abe9a188f --- /dev/null +++ b/modules/aspect_bazel_lib/1.35.0/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 = "1.35.0", + compatibility_level = 1, + ) + + # Lower-bound versions of our dependencies diff --git a/modules/aspect_bazel_lib/1.35.0/presubmit.yml b/modules/aspect_bazel_lib/1.35.0/presubmit.yml new file mode 100644 index 00000000000..34333e34223 --- /dev/null +++ b/modules/aspect_bazel_lib/1.35.0/presubmit.yml @@ -0,0 +1,10 @@ +bcr_test_module: + module_path: "e2e/smoke" + matrix: + platform: ["debian10", "macos", "ubuntu2004", "windows"] + tasks: + run_tests: + name: "Run test module" + platform: ${{ platform }} + test_targets: + - "//..." diff --git a/modules/aspect_bazel_lib/1.35.0/source.json b/modules/aspect_bazel_lib/1.35.0/source.json new file mode 100644 index 00000000000..8c0373db15a --- /dev/null +++ b/modules/aspect_bazel_lib/1.35.0/source.json @@ -0,0 +1,10 @@ +{ + "integrity": "sha256-6VBb2VbaZLV2xDPk5B2nZUD9i4ibvRdhf+SApkaxv7k=", + "strip_prefix": "bazel-lib-1.35.0", + "url": "https://github.com/aspect-build/bazel-lib/releases/download/v1.35.0/bazel-lib-v1.35.0.tar.gz", + "patches": { + "go_dev_dep.patch": "sha256-OcqYZNkw6zXpYsZhidT99VrrydGAuEbgDkiFyVRlKec=", + "module_dot_bazel_version.patch": "sha256-rCwJFlyvXboajxLxMQFoShR9sqHk1jJm0FIDeXDEbGY=" + }, + "patch_strip": 1 +} diff --git a/modules/aspect_bazel_lib/metadata.json b/modules/aspect_bazel_lib/metadata.json index c9cafacf9f8..14943f809ea 100644 --- a/modules/aspect_bazel_lib/metadata.json +++ b/modules/aspect_bazel_lib/metadata.json @@ -77,7 +77,8 @@ "1.34.1", "1.34.2", "1.34.4", - "1.34.5" + "1.34.5", + "1.35.0" ], "yanked_versions": { "1.31.0": "1.31.0 has a breaking change to the default yq version",