Merge branch 'bazelbuild:main' into main

modules/ape/1.0.0-beta.11/presubmit.yml

@@ -0,0 +1,23 @@
+bcr_test_module:
+  module_path: e2e
+  matrix:
+    bazel:
+      - 7.x
+    platform:
+      - centos7_java11_devtoolset10
+      - debian10
+      - debian11
+      - ubuntu2004
+      - ubuntu2004_arm64
+      - ubuntu2204
+      - fedora39
+      - macos
+      - macos_arm64
+      - windows
+  tasks:
+    e2e_tests:
+      name: Run end-to-end Tests
+      bazel: ${{ bazel }}
+      platform: ${{ platform }}
+      test_targets:
+        - "//..."

modules/ape/1.0.0-beta.11/source.json

@@ -0,0 +1,5 @@
+{
+  "url": "https://gitlab.arm.com/bazel/ape/-/releases/v1.0.0-beta.11/downloads/src.tar.gz",
+  "integrity": "sha512-qGyXIPfEYHMAhe75UrvEMaFD9Rhvh2NQTAGKVKDpUwPBvctNhF31eSknLU7YoDTWPyuQILMo6xy5pWWQ4UHqLw==",
+  "strip_prefix": "ape-v1.0.0-beta.11"
+}

modules/ape/metadata.json

@@ -12,7 +12,8 @@
     "1.0.0-beta.3",
     "1.0.0-beta.4",
     "1.0.0-beta.6",
-    "1.0.0-beta.7"
+    "1.0.0-beta.7",
+    "1.0.0-beta.11"
   ],
   "maintainers": [
     {

modules/aspect_bazel_lib/2.7.8/MODULE.bazel

@@ -0,0 +1,77 @@
+"aspect-build/bazel-lib"
+
+module(
+    name = "aspect_bazel_lib",
+    version = "2.7.8",
+    bazel_compatibility = [">=6.0.0"],
+    compatibility_level = 1,
+)
+
+# Lower-bounds (minimum) versions for direct runtime 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.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_toolchains", "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 = "gazelle",
+    version = "0.36.0",
+    dev_dependency = True,
+)
+bazel_dep(
+    name = "rules_go",
+    version = "0.46.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",
+)
+
+host = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "host", dev_dependency = True)
+host.host()
+use_repo(host, "aspect_bazel_lib_host")
+
+bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.5.0", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "6.4.0", dev_dependency = True)
+bazel_dep(name = "bazel_features", version = "0.2.0", dev_dependency = True)

modules/aspect_bazel_lib/2.7.8/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.36.0",
+-    # In released versions: dev_dependency = True
++    dev_dependency = True,
+ )
+ bazel_dep(
+     name = "rules_go",
+     version = "0.46.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(

modules/aspect_bazel_lib/2.7.8/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.7.8",
+     bazel_compatibility = [">=6.0.0"],
+     compatibility_level = 1,
+ )
+

modules/aspect_bazel_lib/2.7.8/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:
+        - "//..."

modules/aspect_bazel_lib/2.7.8/source.json

@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-cUz4zpWhmLqwpqOtr/6pnpKdLwG/bUpZoubWr3K0gYw=",
+    "strip_prefix": "bazel-lib-2.7.8",
+    "url": "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.8/bazel-lib-v2.7.8.tar.gz",
+    "patches": {
+        "go_dev_dep.patch": "sha256-DTc/hk+etl4D50M0BLRik2vHbrgDb6rds+Dj4xphWb4=",
+        "module_dot_bazel_version.patch": "sha256-cizRqvd+TodqhuwU1ml4P1h1j864kSncxbneUmIETo4="
+    },
+    "patch_strip": 1
+}

modules/aspect_bazel_lib/metadata.json

@@ -123,7 +123,8 @@
         "2.7.2",
         "2.7.3",
         "2.7.6",
-        "2.7.7"
+        "2.7.7",
+        "2.7.8"
     ],
     "yanked_versions": {
         "1.31.0": "1.31.0 has a breaking change to the default yq version",