.bazelrc.ci

@@ -16,9 +16,6 @@ common --show_timestamps
 # Do not wrap any output
 common --terminal_columns=0
 
-# Print relative paths where possible to reduce noise
-common --attempt_to_print_relative_paths
-
 # Output as much information in the CI log about failures as possible
 build --verbose_failures
 
@@ -28,6 +25,9 @@ test --test_output=errors
 # Output as much information when a test exceeds a timeout
 test --test_verbose_timeout_warnings
 
+# Validate that the lockfile is correct
+common --lockfile_mode=error
+
 # These locations are cached on the CI
 build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
 build:local --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
@@ -60,5 +60,5 @@ build:remote --experimental_profile_include_primary_output
 # Eliminate duplicate references in the Build Event Stream
 build:remote --nolegacy_important_outputs
 
-# TODO: remove this when `bazel/ape` binaries work on remote execution `arm64` instances
-build:remote --host_platform=@toolchain_utils//toolchain/platform:amd64-linux-gnu
+# Describe remote executors
+build:remote --extra_execution_platforms=@toolchain_utils//toolchain/platform:amd64-linux-gnu

.bazelversion

-7.0.0
+7.3.1

.gitlab-ci.yml

 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.3"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.4"
     inputs:
       variables: |
         CI_PROJECT_DIR
@@ -21,14 +21,20 @@ default:
 
 test:
   extends: .bazelisk
+  cache:
+    - !reference [.bazelisk, cache]
+    - key: "bazel-cache-${CI_PROJECT_ID}"
+      paths:
+      - ".cache/bazel/disk"
+      - ".cache/bazel/repo"
   parallel:
     matrix:
       - ROOT:
-          - .
-          - e2e
+        - .
+        - e2e
         CONFIG:
-          - local
-          - remote
+        - local
+        - remote
   script:
     - cd "${ROOT}"; bazelisk test --config="${CONFIG}" //...
 

CHANGELOG.md

+# [1.0.0-beta.2](https://git.gitlab.arm.com/bazel/rules_tar/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2024-08-30)
+
+### Bug Fixes
+
+- **ape:** switch to `@ape//ape/toolchain/info:tar` ([3fbb564](https://git.gitlab.arm.com/bazel/rules_tar/commit/3fbb564107565ff8f55a3f14a67f3d0a5e4de672))
+- **concatenate:** build pure Go ([dd5e64d](https://git.gitlab.arm.com/bazel/rules_tar/commit/dd5e64d06e3d6e006181b6e07096c13765ca3853))
+- **concatenate:** run under hermetic Bash ([11b5313](https://git.gitlab.arm.com/bazel/rules_tar/commit/11b531355577a9cdd727749160671c398c57ea17))
+
+### Features
+
+- add `//tar/concatenate` target ([6ebc7cf](https://git.gitlab.arm.com/bazel/rules_tar/commit/6ebc7cfa600cbc22eb90c64512af3204a9d60634))
+- add `//tar/concatenate` target ([43b780b](https://git.gitlab.arm.com/bazel/rules_tar/commit/43b780b31c78ae36233db6d13b7ec52cd631e041))
+- add `concatenate` toolchain ([6817c55](https://git.gitlab.arm.com/bazel/rules_tar/commit/6817c5550b1725729053b3caa970554aabf0baea))
+- **concatenate:** duplicate handling ([e0f4f73](https://git.gitlab.arm.com/bazel/rules_tar/commit/e0f4f739600ad540bf0b06bf510d0594092f15fc))
+
 # 1.0.0-beta.1 (2024-07-18)
 
 ### Bug Fixes

MODULE.bazel

 module(
     name = "rules_tar",
-    version = "1.0.0-beta.1",
+    version = "1.0.0-beta.2",
     bazel_compatibility = [
         ">=7.0.0",
     ],
     compatibility_level = 1,
 )
 
+bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.6")
 bazel_dep(name = "rules_gzip", version = "1.0.0-beta.1")
 bazel_dep(name = "rules_bzip2", version = "1.0.0-beta.1")
 bazel_dep(name = "rules_zstd", version = "1.0.0-beta.1")
 bazel_dep(name = "rules_xz", version = "1.0.0-beta.1")
-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.9")
-bazel_dep(name = "ape", version = "1.0.0-beta.11")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.12")
+bazel_dep(name = "ape", version = "1.0.0-beta.12")
+bazel_dep(name = "rules_go", version = "0.49.0")
+bazel_dep(name = "platforms", version = "0.0.10")
+
+bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0", dev_dependency = True)
 
 export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
 use_repo(export, "ape-tar")
@@ -24,9 +29,12 @@ use_repo(export, "tar")
 
 resolved = use_repo_rule("@toolchain_utils//toolchain/resolved:defs.bzl", "toolchain_resolved")
 
-resolved(
-    name = "resolved-tar",
-    toolchain_type = "//tar/toolchain/tar:type",
-)
+[
+    resolved(
+        name = "resolved-{}".format(toolchain),
+        toolchain_type = "//tar/toolchain/{}:type".format(toolchain),
+    )
+    for toolchain in ("tar", "concatenate")
+]
 
 register_toolchains("//tar/toolchain/...")

e2e/.bazelrc.ci

@@ -16,9 +16,6 @@ common --show_timestamps
 # Do not wrap any output
 common --terminal_columns=0
 
-# Print relative paths where possible to reduce noise
-common --attempt_to_print_relative_paths
-
 # Output as much information in the CI log about failures as possible
 build --verbose_failures
 
@@ -28,6 +25,9 @@ test --test_output=errors
 # Output as much information when a test exceeds a timeout
 test --test_verbose_timeout_warnings
 
+# Validate that the lockfile is correct
+common --lockfile_mode=error
+
 # These locations are cached on the CI
 build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
 build:local --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
@@ -60,5 +60,5 @@ build:remote --experimental_profile_include_primary_output
 # Eliminate duplicate references in the Build Event Stream
 build:remote --nolegacy_important_outputs
 
-# TODO: remove this when `bazel/ape` binaries work on remote execution `arm64` instances
-build:remote --host_platform=@toolchain_utils//toolchain/platform:amd64-linux-gnu
+# Describe remote executors
+build:remote --extra_execution_platforms=@toolchain_utils//toolchain/platform:amd64-linux-gnu

e2e/.bazelversion

-7.0.0
+7.3.1

e2e/MODULE.bazel

@@ -5,11 +5,13 @@ module(
     ],
 )
 
-bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.9")
-bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.1")
-bazel_dep(name = "rules_diff", version = "1.0.0-beta.3")
-bazel_dep(name = "rules_tar", version = "0.0.0")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.12")
+bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.6")
+bazel_dep(name = "rules_diff", version = "1.0.0-beta.4")
+bazel_dep(name = "rules_tar")
 local_path_override(
     module_name = "rules_tar",
     path = "..",
 )
+
+bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0", dev_dependency = True)

e2e/concatenate/BUILD.bazel

+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar",
+    srcs = [
+        "//fixture:txt.tar",
+        "//fixture/nested:txt.tar",
+    ],
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+)

e2e/concatenate/bzip2/BUILD.bazel

+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar.bz2",
+    srcs = [
+        "//fixture:txt.tar.bz2",
+        "//fixture/nested:txt.tar.bz2",
+    ],
+    compress = "@rules_tar//tar/compress:bzip2",
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar.bz2",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+)

e2e/concatenate/gzip/BUILD.bazel

+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar.gz",
+    srcs = [
+        "//fixture:txt.tar.gz",
+        "//fixture/nested:txt.tar.gz",
+    ],
+    compress = "@rules_tar//tar/compress:gzip",
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar.gz",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+)

e2e/concatenate/xz/BUILD.bazel

+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar.xz",
+    srcs = [
+        "//fixture:txt.tar.xz",
+        "//fixture/nested:txt.tar.xz",
+    ],
+    compress = "@rules_tar//tar/compress:xz",
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar.xz",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+)

e2e/concatenate/zstd/BUILD.bazel

+load("@rules_diff//diff/directory/test:defs.bzl", "diff_directory_test")
+load("@rules_tar//tar/unpack:defs.bzl", "tar_unpack")
+load("@rules_tar//tar/concatenate:defs.bzl", "tar_concatenate")
+
+tar_concatenate(
+    name = "concatenated.tar.zst",
+    srcs = [
+        "//fixture:txt.tar.zst",
+        "//fixture/nested:txt.tar.zst",
+    ],
+    compress = "@rules_tar//tar/compress:zstd",
+)
+
+tar_unpack(
+    name = "unpack",
+    src = ":concatenated.tar.zst",
+)
+
+diff_directory_test(
+    name = "diff",
+    size = "small",
+    a = "//fixture/directory:all",
+    b = ":unpack",
+    # FIXME: not sure why `zstd` decompression is failing
+    tags = ["manual"],
+)

e2e/fixture/BUILD.bazel

@@ -5,8 +5,13 @@ exports_files(
         "fixture.tar",
         "fixture.tar.bz2",
         "fixture.tar.gz",
-        "fixture.tar.zst",
         "fixture.tar.xz",
+        "fixture.tar.zst",
+        "txt.tar",
+        "txt.tar.gz",
+        "txt.tar.bz2",
+        "txt.tar.xz",
+        "txt.tar.zst",
     ],
     visibility = ["//:__subpackages__"],
 )