use 6.0

.bazelversion

@@ -1,4 +1,4 @@
-7.0.0-pre.20231018.3
+6.2.1
 # The first line of this file is used by Bazelisk and Bazel to be sure
 # the right version of Bazel is used to build and test this repo.
 # This also defines which version is used on CI.

.github/workflows/ci.yaml

@@ -27,7 +27,5 @@ jobs:
       exclude: |
         [
           {"folder": ".", "bzlmodEnabled": false},
-          {"bazelversion": "5.4.0", "bzlmodEnabled": true},
-          {"bazelversion": "5.4.0", "os": "macos-latest"},
-          {"bazelversion": "5.4.0", "os": "windows-latest"},
+          {"bazelversion": "5.4.0"},
         ]

MODULE.bazel

@@ -17,14 +17,3 @@ use_repo(bazel_lib_toolchains, "bsd_tar_toolchains")
 bazel_dep(name = "gazelle", version = "0.34.0", dev_dependency = True, repo_name = "bazel_gazelle")
 bazel_dep(name = "bazel_skylib_gazelle_plugin", version = "1.4.1", dev_dependency = True)
 bazel_dep(name = "buildifier_prebuilt", version = "6.1.2", dev_dependency = True)
-
-http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-
-http_archive(
-    name = "ca-certificates",
-    build_file_content = 'exports_files(["data.tar.xz"])',
-    canonical_id = "test",
-    sha256 = "b2d488ad4d8d8adb3ba319fc9cb2cf9909fc42cb82ad239a26c570a2e749c389",
-    type = ".deb",
-    urls = ["https://snapshot.debian.org/archive/debian/20231106T210201Z/pool/main/c/ca-certificates/ca-certificates_20210119_all.deb"],
-)

WORKSPACE.bazel

@@ -1 +1,12 @@
 # Marker that this is the root of a Bazel workspace.
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "ca-certificates",
+    build_file_content = 'exports_files(["data.tar.xz"])',
+    canonical_id = "test",
+    sha256 = "b2d488ad4d8d8adb3ba319fc9cb2cf9909fc42cb82ad239a26c570a2e749c389",
+    type = ".deb",
+    urls = ["https://snapshot.debian.org/archive/debian/20231106T210201Z/pool/main/c/ca-certificates/ca-certificates_20210119_all.deb"],
+)

distroless/private/tar.bzl

@@ -41,11 +41,11 @@ def _build_tar(ctx, mtree, output, inputs, compression = "gzip", mnemonic = "Tar
     args.add(compression, format = "--%s")
     args.add("--file", output)
     args.add(mtree_out, format = "@%s")
-
     ctx.actions.run(
         executable = bsdtar.tarinfo.binary,
         inputs = inputs,
         outputs = [output],
+        tools = bsdtar.default.files,
         arguments = [args],
         mnemonic = mnemonic,
     )

e2e/smoke/WORKSPACE.bazel

@@ -14,6 +14,6 @@ local_repository(
 # you should fetch it *before* calling this.
 # Alternatively, you can skip calling this function, so long as you've
 # already fetched all the dependencies.
-load("@rules_distroless//distroless:repositories.bzl", "rules_distroless_dependencies")
+load("@rules_distroless//distroless:dependencies.bzl", "rules_distroless_dependencies")
 
 rules_distroless_dependencies()