diff --git a/modules/aspect_bazel_lib/1.40.2/MODULE.bazel b/modules/aspect_bazel_lib/1.40.2/MODULE.bazel new file mode 100644 index 00000000000..d90f14babf1 --- /dev/null +++ b/modules/aspect_bazel_lib/1.40.2/MODULE.bazel @@ -0,0 +1,66 @@ +"aspect-build/bazel-lib" + +module( + name = "aspect_bazel_lib", + version = "1.40.2", + 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") + +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.expand_template() +use_repo(bazel_lib_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", +) + +# 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.4.1", dev_dependency = True) +bazel_dep(name = "buildifier_prebuilt", version = "6.3.3", dev_dependency = True) +bazel_dep(name = "bazel_features", version = "0.1.0", dev_dependency = True) diff --git a/modules/aspect_bazel_lib/1.40.2/patches/go_dev_dep.patch b/modules/aspect_bazel_lib/1.40.2/patches/go_dev_dep.patch new file mode 100644 index 00000000000..99b1bc48a9f --- /dev/null +++ b/modules/aspect_bazel_lib/1.40.2/patches/go_dev_dep.patch @@ -0,0 +1,27 @@ +diff --git a/MODULE.bazel b/MODULE.bazel +index 07a6eff..26702ad 100644 +--- a/MODULE.bazel ++++ b/MODULE.bazel +@@ -34,19 +34,19 @@ register_toolchains( + 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/1.40.2/patches/module_dot_bazel_version.patch b/modules/aspect_bazel_lib/1.40.2/patches/module_dot_bazel_version.patch new file mode 100644 index 00000000000..e77a0d9dd2e --- /dev/null +++ b/modules/aspect_bazel_lib/1.40.2/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.40.2", + compatibility_level = 1, + ) + + # Lower-bound versions of our dependencies diff --git a/modules/aspect_bazel_lib/1.40.2/presubmit.yml b/modules/aspect_bazel_lib/1.40.2/presubmit.yml new file mode 100644 index 00000000000..e63a5721ca6 --- /dev/null +++ b/modules/aspect_bazel_lib/1.40.2/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/1.40.2/source.json b/modules/aspect_bazel_lib/1.40.2/source.json new file mode 100644 index 00000000000..5e1bec24b84 --- /dev/null +++ b/modules/aspect_bazel_lib/1.40.2/source.json @@ -0,0 +1,10 @@ +{ + "integrity": "sha256-BP7tzQb3HQSXqB/dMiAUCjc/+dK/+UYg+9ULd0+W2OA=", + "strip_prefix": "bazel-lib-1.40.2", + "url": "https://github.com/aspect-build/bazel-lib/releases/download/v1.40.2/bazel-lib-v1.40.2.tar.gz", + "patches": { + "go_dev_dep.patch": "sha256-dEFxvx2hBB/tOWlknfRHRXNCdvYpvrxsYHWaMGF2QgA=", + "module_dot_bazel_version.patch": "sha256-1HPK4HHAw+b7Z/geNGKZT3CQuI5QNUryCvwoBfSU0+0=" + }, + "patch_strip": 1 +} diff --git a/modules/aspect_bazel_lib/metadata.json b/modules/aspect_bazel_lib/metadata.json index b97725b81f9..304dd439bd6 100644 --- a/modules/aspect_bazel_lib/metadata.json +++ b/modules/aspect_bazel_lib/metadata.json @@ -91,6 +91,7 @@ "1.39.0", "1.39.1", "1.40.0", + "1.40.2", "2.0.0-beta0", "2.0.0-beta1", "2.0.0-rc0",