.bazelrc

-# Enable `bzlmod`
-common --enable_bzlmod
-
 # Build cache
 build --experimental_guard_against_concurrent_changes
 

.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.3](https://git.gitlab.arm.com/bazel/rules_xz/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2024-09-03)
+
+### Features
+
+- add C/C++ `xz` toolchain ([8bcc4ef](https://git.gitlab.arm.com/bazel/rules_xz/commit/8bcc4ef0ff87a651ad811e7ecfdf8a02934ac1a6))
+
 # [1.0.0-beta.2](https://git.gitlab.arm.com/bazel/rules_xz/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2024-08-12)
 
 ### Bug Fixes

MODULE.bazel

 module(
     name = "rules_xz",
-    version = "1.0.0-beta.2",
+    version = "1.0.0-beta.3",
     bazel_compatibility = [
         ">=7.0.0",
     ],
@@ -10,6 +10,9 @@ module(
 bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.1")
 bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.12")
 bazel_dep(name = "ape", version = "1.0.0-beta.12")
+bazel_dep(name = "xz", version = "5.4.5.bcr.4", repo_name = "bcr")
+
+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-xz")

README.md

@@ -31,6 +31,9 @@ xz_decompress(
 
 The module is entirely hermetic, using `@ape//:xz` as the default toolchain.
 
+The `@xz//:xz` is available as a toolchain but is only hermetic if a hermetic C/C++ toolchain
+is configured. Select it with `--extra_toolchains=@rules_xz//xz/toolchain/xz:built`.
+
 ## Release Registry
 
 The project publishes the relevant files to GitLab releases for use when a version has not been added to the upstream [BCR][bcr].

e2e/.bazelrc

-# Enable `bzlmod`
-common --enable_bzlmod
-
 # Build cache
 build --experimental_guard_against_concurrent_changes
 

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,6 +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

@@ -13,3 +13,5 @@ local_path_override(
     module_name = "rules_xz",
     path = "..",
 )
+
+bazel_dep(name = "hermetic_cc_toolchain", version = "3.1.0", dev_dependency = True)

e2e/xz/level/BUILD.bazel

@@ -18,4 +18,4 @@ diff_file_test(
     size = "small",
     a = "//fixture:hello-world.txt",
     b = ":decompress",
-)
\ No newline at end of file
+)

xz/toolchain/xz/BUILD.bazel

 load("@ape//ape/toolchain:defs.bzl", "ape_toolchain")
+load("@toolchain_utils//toolchain/info:defs.bzl", "toolchain_info")
 load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 
 toolchain_type(
@@ -6,6 +7,17 @@ toolchain_type(
     visibility = ["//visibility:public"],
 )
 
+toolchain_info(
+    name = "xz",
+    target = "@bcr//:xz",
+)
+
+toolchain(
+    name = "built",
+    toolchain = ":xz",
+    toolchain_type = ":type",
+)
+
 ape_toolchain(
     name = "ape",
     toolchain = "@ape//ape/toolchain/info:xz",