.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_gzip/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2024-09-03)
+
+### Features
+
+- add `[@rules](https://git.gitlab.arm.com/rules)_gzip//gzip/toolchain/gzip:type` toolchain ([9ca8765](https://git.gitlab.arm.com/bazel/rules_gzip/commit/9ca8765104026fdefd5147ececd4a85625b59051))
+
 # [1.0.0-beta.2](https://git.gitlab.arm.com/bazel/rules_gzip/compare/v1.0.0-beta.1...v1.0.0-beta.2) (2024-08-12)
 
 ### Bug Fixes

MODULE.bazel

 module(
     name = "rules_gzip",
-    version = "1.0.0-beta.2",
+    version = "1.0.0-beta.3",
     bazel_compatibility = [
         ">=7.0.0",
     ],
@@ -12,18 +12,18 @@ bazel_dep(name = "rules_coreutils", version = "1.0.0-beta.1")
 bazel_dep(name = "ape", version = "1.0.0-beta.12")
 
 export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
-use_repo(export, "ape-pigz")
+use_repo(export, "ape-gzip")
 export.symlink(
-    name = "pigz",
-    target = "@ape-pigz",
+    name = "gzip",
+    target = "@ape-gzip",
 )
-use_repo(export, "pigz")
+use_repo(export, "gzip")
 
 resolved = use_repo_rule("@toolchain_utils//toolchain/resolved:defs.bzl", "toolchain_resolved")
 
 resolved(
-    name = "resolved-pigz",
-    toolchain_type = "//gzip/toolchain/pigz:type",
+    name = "resolved-gzip",
+    toolchain_type = "//gzip/toolchain/gzip:type",
 )
 
 register_toolchains("//gzip/toolchain/...")

README.md

@@ -29,7 +29,7 @@ gzip_decompress(
 
 # Hermeticity
 
-The module is entirely hermetic, using `@ape//:pigz` as the default toolchain.
+The module is entirely hermetic, using `@ape//:gzip` as the default toolchain.
 
 ## Release Registry
 

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,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/toolchain/gzip/BUILD.bazel

+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+
+build_test(
+    name = "resolved",
+    targets = ["@rules_gzip//gzip/toolchain/gzip:resolved"],
+)

gzip/compress/rule.bzl

@@ -30,7 +30,7 @@ ATTRS = {
 }
 
 def implementation(ctx):
-    gzip = ctx.toolchains["//gzip/toolchain/pigz:type"]
+    gzip = ctx.toolchains["//gzip/toolchain/gzip:type"]
 
     output = ctx.actions.declare_file("{}.gz".format(ctx.file.src.basename))
     rendered = ctx.actions.declare_file("{}.{}".format(ctx.label.name, ctx.file._template.extension))
@@ -54,7 +54,7 @@ def implementation(ctx):
         arguments = [args],
         tools = [gzip.run],
         executable = rendered,
-        toolchain = "//gzip/toolchain/pigz:type",
+        toolchain = "//gzip/toolchain/gzip:type",
         mnemonic = "GzipCompress",
         progress_message = "Compressing %{input} to %{output}",
     )
@@ -65,7 +65,7 @@ gzip_compress = rule(
     doc = DOC,
     attrs = ATTRS,
     implementation = implementation,
-    toolchains = ["//gzip/toolchain/pigz:type"],
+    toolchains = ["//gzip/toolchain/gzip:type"],
 )
 
 compress = gzip_compress

gzip/decompress/rule.bzl

@@ -23,7 +23,7 @@ ATTRS = {
 }
 
 def implementation(ctx):
-    gzip = ctx.toolchains["//gzip/toolchain/pigz:type"]
+    gzip = ctx.toolchains["//gzip/toolchain/gzip:type"]
 
     output = ctx.actions.declare_file(ctx.file.src.basename.removesuffix(".gz"))
     rendered = ctx.actions.declare_file("{}.{}".format(ctx.label.name, ctx.file._template.extension))
@@ -46,7 +46,7 @@ def implementation(ctx):
         arguments = [args],
         tools = [gzip.run],
         executable = rendered,
-        toolchain = "//gzip/toolchain/pigz:type",
+        toolchain = "//gzip/toolchain/gzip:type",
         mnemonic = "GzipDecompress",
         progress_message = "Decompressing %{input} to %{output}",
     )
@@ -57,7 +57,7 @@ gzip_decompress = rule(
     doc = DOC,
     attrs = ATTRS,
     implementation = implementation,
-    toolchains = ["//gzip/toolchain/pigz:type"],
+    toolchains = ["//gzip/toolchain/gzip:type"],
 )
 
 decompress = gzip_decompress

gzip/toolchain/gzip/BUILD.bazel

+load("@ape//ape/toolchain:defs.bzl", "ape_toolchain")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
+
+toolchain_type(
+    name = "type",
+    visibility = ["//visibility:public"],
+)
+
+ape_toolchain(
+    name = "ape",
+    toolchain = "@ape//ape/toolchain/info:gzip",
+    toolchain_type = ":type",
+)
+
+alias(
+    name = "resolved",
+    actual = "@resolved-gzip",
+    visibility = ["//visibility:public"],
+)
+
+toolchain_test(
+    name = "test",
+    args = ["--version"],
+    toolchains = [":resolved"],
+)

gzip/toolchain/pigz/BUILD.bazel

-load("@ape//ape/toolchain:defs.bzl", "ape_toolchain")
-load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
-
-toolchain_type(
+alias(
     name = "type",
+    actual = "//gzip/toolchain/gzip:type",
+    deprecation = "Use `@rules_gzip//gzip/toolchain/gzip:type` instead.",
     visibility = ["//visibility:public"],
 )
 
-ape_toolchain(
-    name = "ape",
-    toolchain = "@ape//ape/toolchain/info:pigz",
-    toolchain_type = ":type",
-)
-
 alias(
     name = "resolved",
-    actual = "@resolved-pigz",
+    actual = "//gzip/toolchain/gzip:resolved",
+    deprecation = "Use `@rules_gzip//gzip/toolchain/gzip:resolved` instead.",
     visibility = ["//visibility:public"],
 )
-
-toolchain_test(
-    name = "test",
-    args = ["--version"],
-    toolchains = [":resolved"],
-)