Merge branch 'bazelbuild:main' into main

xFile3160 · Mar 30, 2024 · cca9ed5 · cca9ed5
2 parents d83c7c4 + 9738332
commit cca9ed5
Show file tree

Hide file tree

Showing 318 changed files with 15,956 additions and 43 deletions.
diff --git a/.github/workflows/dismiss_approvals.yml b/.github/workflows/dismiss_approvals.yml
@@ -15,7 +15,7 @@ jobs:
           egress-policy: audit
 
       - name: Run BCR PR Reviewer
-        uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@4b83ef1d08decb055ac7a6f864c3759fa22984a4 # master
+        uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@9fddc08b79867b8eea406c2d75898d4e98b20388 # master
         with:
           # This token needs to be updated annually on Feb 05.
           token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}

diff --git a/.github/workflows/notify_maintainers.yml b/.github/workflows/notify_maintainers.yml
@@ -16,7 +16,7 @@ jobs:
           egress-policy: audit
 
       - name: Run BCR PR Reviewer
-        uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@4b83ef1d08decb055ac7a6f864c3759fa22984a4 # master
+        uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@9fddc08b79867b8eea406c2d75898d4e98b20388 # master
         with:
           # This token needs to be updated annually on Feb 05.
           token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}

diff --git a/.github/workflows/review_prs.yml b/.github/workflows/review_prs.yml
@@ -16,7 +16,7 @@ jobs:
 
       - name: Run BCR PR Reviewer
         if: github.repository_owner == 'bazelbuild'
-        uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@4b83ef1d08decb055ac7a6f864c3759fa22984a4 # master
+        uses: bazelbuild/continuous-integration/actions/bcr-pr-reviewer@9fddc08b79867b8eea406c2d75898d4e98b20388 # master
         with:
           # This token needs to be updated annually on Feb 05.
           token: ${{ secrets.BCR_PR_REVIEW_HELPER_TOKEN }}

diff --git a/modules/aspect_bazel_lib/1.41.0/MODULE.bazel b/modules/aspect_bazel_lib/1.41.0/MODULE.bazel
@@ -0,0 +1,66 @@
+"aspect-build/bazel-lib"
+
+module(
+    name = "aspect_bazel_lib",
+    version = "1.41.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")
+
+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.41.0/patches/go_dev_dep.patch b/modules/aspect_bazel_lib/1.41.0/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.41.0/patches/module_dot_bazel_version.patch b/modules/aspect_bazel_lib/1.41.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.41.0",
+     compatibility_level = 1,
+ )
+
+ # Lower-bound versions of our dependencies
diff --git a/modules/aspect_bazel_lib/1.41.0/presubmit.yml b/modules/aspect_bazel_lib/1.41.0/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.41.0/source.json b/modules/aspect_bazel_lib/1.41.0/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-jnpRxruDUCP8p74vBNaIVkhprU35XWxWyi2tzMP5APM=",
+    "strip_prefix": "bazel-lib-1.41.0",
+    "url": "https://github.com/aspect-build/bazel-lib/releases/download/v1.41.0/bazel-lib-v1.41.0.tar.gz",
+    "patches": {
+        "go_dev_dep.patch": "sha256-dEFxvx2hBB/tOWlknfRHRXNCdvYpvrxsYHWaMGF2QgA=",
+        "module_dot_bazel_version.patch": "sha256-nyfPZJQ/Vyo96bOOp/Iz7V9s/UA4pNZcuh+epII3D04="
+    },
+    "patch_strip": 1
+}
diff --git a/modules/aspect_bazel_lib/1.42.0/MODULE.bazel b/modules/aspect_bazel_lib/1.42.0/MODULE.bazel
@@ -0,0 +1,73 @@
+"aspect-build/bazel-lib"
+
+module(
+    name = "aspect_bazel_lib",
+    version = "1.42.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")
+
+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()
+use_repo(bazel_lib_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",
+    # 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",
+)
+
+# 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.42.0/patches/go_dev_dep.patch b/modules/aspect_bazel_lib/1.42.0/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.42.0/patches/module_dot_bazel_version.patch b/modules/aspect_bazel_lib/1.42.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.42.0",
+     compatibility_level = 1,
+ )
+
+ # Lower-bound versions of our dependencies
diff --git a/modules/aspect_bazel_lib/1.42.0/presubmit.yml b/modules/aspect_bazel_lib/1.42.0/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.42.0/source.json b/modules/aspect_bazel_lib/1.42.0/source.json
@@ -0,0 +1,10 @@
+{
+    "integrity": "sha256-bnKeSQBpViPvpenHOxCwUJ6xYGtzyvw3SjWa7UyeaVg=",
+    "strip_prefix": "bazel-lib-1.42.0",
+    "url": "https://github.com/aspect-build/bazel-lib/releases/download/v1.42.0/bazel-lib-v1.42.0.tar.gz",
+    "patches": {
+        "go_dev_dep.patch": "sha256-dEFxvx2hBB/tOWlknfRHRXNCdvYpvrxsYHWaMGF2QgA=",
+        "module_dot_bazel_version.patch": "sha256-IU1qqEuicK1AotEepQad6eFBtvrL/g6QCHWDzQxN4o4="
+    },
+    "patch_strip": 1
+}
diff --git a/modules/aspect_bazel_lib/1.42.1/MODULE.bazel b/modules/aspect_bazel_lib/1.42.1/MODULE.bazel
@@ -0,0 +1,73 @@
+"aspect-build/bazel-lib"
+
+module(
+    name = "aspect_bazel_lib",
+    version = "1.42.1",
+    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.tar()
+bazel_lib_toolchains.expand_template()
+use_repo(bazel_lib_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",
+    # 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",
+)
+
+# 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)