Compare revisions

Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson
--- a/.bazelrc.ci
+++ b/.bazelrc.ci
@@ -31,3 +31,6 @@ test --test_verbose_timeout_warnings
 # These locations are cached on the CI
 build --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
 build --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
+
+# Here to dogfood the `ruleset` component
+build:local --enable_bzlmod
--- a/.bazelversion
+++ b/.bazelversion
-7.2.0
+7.4.0
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,15 @@ include:
  - component: "${CI_SERVER_HOST}/${CI_PROJECT_PATH}/bazelisk@${CI_COMMIT_SHA}"
    inputs:
      tag: "${CI_COMMIT_SHA}"
+  - component: "${CI_SERVER_HOST}/${CI_PROJECT_PATH}/ruleset@${CI_COMMIT_SHA}"
+    inputs:
+      tag: "${CI_COMMIT_SHA}"
+      needs:
+        - bootstrap
+      configs:
+        - local
+      versions:
+        - 7.0.0

 default:
  tags:
@@ -31,16 +40,7 @@ bootstrap:
    - bazelisk run --stamp --embed_label="${CI_COMMIT_SHA}" -- //bazelisk/push:tagged
  artifacts: {}

-.job:
-  extends: .bazelisk
-  cache:
-    - !reference [.bazelisk, cache]
-    - key: "bazel-cache-${CI_PROJECT_ID}"
-      paths:
-        - ".cache/bazel/disk"
-        - ".cache/bazel/repo"
-
-version:
+bazelisk:
  extends: .job
  needs:
    - bootstrap
@@ -48,45 +48,14 @@ version:
    - bazelisk version
  artifacts: {}

-test:
-  extends: .job
-  needs:
-    - bootstrap
-
 deploy:
  stage: deploy
  extends: .job
  needs:
-    - test
+    - config
+    - version
  script:
    - !reference [.bazelisk-fragment, rc]
    - echo "${CI_REGISTRY_PASSWORD}" | bazelisk run -- //crane auth login --username "${CI_REGISTRY_USER}" --password-stdin "${CI_REGISTRY}"
    - bazelisk run --stamp --embed_label="${CI_COMMIT_SHA}" -- //bazelisk/push:tagged
  artifacts: {}
-
-# TODO: switch this out for `rules_semantic_release`
-semantic-release:
-  extends: .job
-  stage: .post
-  needs:
-    - deploy
-  image: node:lts
-  cache:
-    - !reference [.job, cache]
-    - key:
-        prefix: "node"
-        files:
-          - package-lock.json
-      paths:
-        - node_modules
-        - .cache/npm
-  before_script:
-    - npm config --location project set cache "${CI_PROJECT_DIR}/.cache/npm"
-    - npm ci --prefer-offline
-  script:
-    - !reference [.bazelisk-fragment, rc]
-    - npx semantic-release
-  rules:
-    - if: $CI_COMMIT_TAG
-      when: never
-    - if: $CI_COMMIT_REF_PROTECTED == "true"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# [1.0.0-beta.7](https://git.gitlab.arm.com/ci/component/bazelisk/compare/v1.0.0-beta.6...v1.0.0-beta.7) (2024-12-05)
+
+### Bug Fixes
+
+- **ruleset:** the `needs` input is now for `config`/`version` ([13e7e89](https://git.gitlab.arm.com/ci/component/bazelisk/commit/13e7e89e0ff05e839d55bd64333572c3834e6e9e))
+
+### Features
+
+- **ruleset:** allow customising the Bazel module `roots` ([fa46a8e](https://git.gitlab.arm.com/ci/component/bazelisk/commit/fa46a8e031e5e8f401a098b25451e585314d7bf6))
+- **ruleset:** allow customising the Bazel versions tested ([9fe08d3](https://git.gitlab.arm.com/ci/component/bazelisk/commit/9fe08d3c52542bd4de5f1dde31e7888634e9f620))
+- **ruleset:** input for `configs` to decide Bazel run command configurations to test ([1bee04f](https://git.gitlab.arm.com/ci/component/bazelisk/commit/1bee04fac1625c590f4eaaeb2dc7dccc1e4add8c))
+
+### BREAKING CHANGES
+
+- **ruleset:** `minimum` is no longer an input to the `ruleset` component. Use `versions` instead.
+- **ruleset:** The `ruleset` component `needs` input is now dependent tasks for the testing jobs. Previously it was for the `semantic-release` job which was not useful.
+
 # [1.0.0-beta.6](https://git.gitlab.arm.com/ci/component/bazelisk/compare/v1.0.0-beta.5...v1.0.0-beta.6) (2024-12-04)

 ### Bug Fixes

--- a/MODULE.bazel
+++ b/MODULE.bazel
 module(
    name = "bazelisk",
-    version = "1.0.0-beta.6",
+    version = "1.0.0-beta.7",
    bazel_compatibility = [
        ">=7.0.0",
    ],
@@ -9,11 +9,12 @@ module(
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.9")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "rules_oci", version = "2.0.0-beta1")
+bazel_dep(name = "rules_distroless", version = "0.3.8")
+bazel_dep(name = "rules_oci", version = "2.0.1")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "container_structure_test", version = "1.19.1")
 bazel_dep(name = "download_utils", version = "1.0.0-beta.2")
-bazel_dep(name = "rules_python", version = "0.34.0")
+bazel_dep(name = "rules_python", version = "0.34.0", dev_dependency=True)

 # We have to avoid the `chmod`/`chown`/`id` unhermetic-ness
 # TODO: remove this when `ignore_root_user_error` is hermetic
@@ -44,11 +45,8 @@ oci.pull(
 )
 use_repo(oci, "distroless", "distroless_linux_386", "distroless_linux_amd64", "distroless_linux_arm64_v8", "distroless_linux_arm_v5", "distroless_linux_arm_v7", "distroless_linux_mips64le", "distroless_linux_ppc64le", "distroless_linux_s390x")

-download_file = use_repo_rule("@download_utils//download/file:defs.bzl", "download_file")
-
-download_deb = use_repo_rule("@download_utils//download/deb:defs.bzl", "download_deb")
-
 # Bazelisk
+download_file = use_repo_rule("@download_utils//download/file:defs.bzl", "download_file")
 [
    download_file(
        name = "{}-{}".format(cpu, os),
@@ -67,6 +65,17 @@ download_deb = use_repo_rule("@download_utils//download/deb:defs.bzl", "download
 ]

 # Debian packages
+apt = use_extension("@rules_distroless//apt:extensions.bzl", "apt")
+
+apt.install(
+    name = "bazelisk-package",
+    lock = "//bazelisk:packages.lock.json",
+    manifest = "//bazelisk:packages.yaml",
+)
+use_repo(apt, "bazelisk-package")
+
+# FIXME: remove these in favour of `bazelisk-package`
+download_deb = use_repo_rule("@download_utils//download/deb:defs.bzl", "download_deb")
 [
    download_deb(
        name = "{}-{}".format(

--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- a/bazelisk/packages.lock.json
+++ b/bazelisk/packages.lock.json
+{
+	"packages": [
+		{
+			"arch": "amd64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_amd64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_amd64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_amd64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "libgcc-s1_12.2.0-14_amd64",
+			"name": "libgcc-s1",
+			"sha256": "f3d1d48c0599aea85b7f2077a01d285badc42998c1a1e7473935d5cf995c8141",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/g/gcc-12/libgcc-s1_12.2.0-14_amd64.deb",
+			"version": "12.2.0-14"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [],
+			"key": "libc6_2.36-9-p-deb12u9_amd64",
+			"name": "libc6",
+			"sha256": "3a043b9dbf1a8c8b5a9e2268253e6dca8c7d431bd7a202fea96364abf374fea9",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/g/glibc/libc6_2.36-9+deb12u9_amd64.deb",
+			"version": "2.36-9+deb12u9"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [],
+			"key": "gcc-12-base_12.2.0-14_amd64",
+			"name": "gcc-12-base",
+			"sha256": "1a03df5a57833d65b5bb08cfa19d50e76f29088dc9e64fb934af42d9023a0807",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/g/gcc-12/gcc-12-base_12.2.0-14_amd64.deb",
+			"version": "12.2.0-14"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [
+				{
+					"key": "libgcc-s1_12.2.0-14_amd64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "libc6_2.36-9-p-deb12u9_amd64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_amd64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "libstdc-p--p-6_12.2.0-14_amd64",
+			"name": "libstdc++6",
+			"sha256": "9b1b269020cec6aced3b39f096f7b67edd1f0d4ab24f412cb6506d0800e19cbf",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/g/gcc-12/libstdc++6_12.2.0-14_amd64.deb",
+			"version": "12.2.0-14"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_amd64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_amd64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_amd64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "zlib1g_1-1.2.13.dfsg-1_amd64",
+			"name": "zlib1g",
+			"sha256": "d7dd1d1411fedf27f5e27650a6eff20ef294077b568f4c8c5e51466dc7c08ce4",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/z/zlib/zlib1g_1.2.13.dfsg-1_amd64.deb",
+			"version": "1:1.2.13.dfsg-1"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_amd64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_amd64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_amd64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "libtinfo6_6.4-4_amd64",
+			"name": "libtinfo6",
+			"sha256": "072d908f38f51090ca28ca5afa3b46b2957dc61fe35094c0b851426859a49a51",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/n/ncurses/libtinfo6_6.4-4_amd64.deb",
+			"version": "6.4-4"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [
+				{
+					"key": "debianutils_5.7-0.5_deb12u1_amd64",
+					"name": "debianutils",
+					"version": "5.7-0.5~deb12u1"
+				},
+				{
+					"key": "libc6_2.36-9-p-deb12u9_amd64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_amd64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_amd64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "base-files_12.4-p-deb12u8_amd64",
+					"name": "base-files",
+					"version": "12.4+deb12u8"
+				},
+				{
+					"key": "libtinfo6_6.4-4_amd64",
+					"name": "libtinfo6",
+					"version": "6.4-4"
+				}
+			],
+			"key": "bash_5.2.15-2-p-b7_amd64",
+			"name": "bash",
+			"sha256": "d3c65202568384a588ea32017b243fe64ca054943a008cba4e5bd8f9e79975c4",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/b/bash/bash_5.2.15-2+b7_amd64.deb",
+			"version": "5.2.15-2+b7"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [],
+			"key": "debianutils_5.7-0.5_deb12u1_amd64",
+			"name": "debianutils",
+			"sha256": "55f951359670eb3236c9e2ccd5fac9ccb3db734f5a22aff21589e7a30aee48c9",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/d/debianutils/debianutils_5.7-0.5~deb12u1_amd64.deb",
+			"version": "5.7-0.5~deb12u1"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [],
+			"key": "base-files_12.4-p-deb12u8_amd64",
+			"name": "base-files",
+			"sha256": "b961a69d1b79f093597d89a96f296ddca17d3bab9d166361c42f07a6beb4f685",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/b/base-files/base-files_12.4+deb12u8_amd64.deb",
+			"version": "12.4+deb12u8"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [
+				{
+					"key": "libcrypt1_1-4.4.33-2_amd64",
+					"name": "libcrypt1",
+					"version": "1:4.4.33-2"
+				},
+				{
+					"key": "libc6_2.36-9-p-deb12u9_amd64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_amd64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_amd64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "toybox_0.8.9-p-dfsg-1_amd64",
+			"name": "toybox",
+			"sha256": "205566740aebc33d20cc061278da8ee444bfa4a93ce6225284851eb66e131ee5",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/t/toybox/toybox_0.8.9+dfsg-1_amd64.deb",
+			"version": "0.8.9+dfsg-1"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_amd64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_amd64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_amd64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "libcrypt1_1-4.4.33-2_amd64",
+			"name": "libcrypt1",
+			"sha256": "f5f60a5cdfd4e4eaa9438ade5078a57741a7a78d659fcb0c701204f523e8bd29",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/libx/libxcrypt/libcrypt1_4.4.33-2_amd64.deb",
+			"version": "1:4.4.33-2"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_amd64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_amd64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_amd64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "busybox_1-1.35.0-4-p-b3_amd64",
+			"name": "busybox",
+			"sha256": "28249bea5fedba0efa6186b7c42cf3cb57ff1c1fbd850fc5a2fbf15c3c085bd6",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/b/busybox/busybox_1.35.0-4+b3_amd64.deb",
+			"version": "1:1.35.0-4+b3"
+		},
+		{
+			"arch": "amd64",
+			"dependencies": [],
+			"key": "linux-libc-dev_6.1.119-1_amd64",
+			"name": "linux-libc-dev",
+			"sha256": "2feea43a31f3c2812c262669c12b114a198a193072daacf30a4d8aab73b0cf93",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian-security/20241205T083717Z/pool/updates/main/l/linux/linux-libc-dev_6.1.119-1_amd64.deb",
+			"version": "6.1.119-1"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_arm64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_arm64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_arm64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "libgcc-s1_12.2.0-14_arm64",
+			"name": "libgcc-s1",
+			"sha256": "6fce2268d8f3152a4e84634f5a24133d3c62903b2f9b11b9c59235cbbc1b23a8",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/g/gcc-12/libgcc-s1_12.2.0-14_arm64.deb",
+			"version": "12.2.0-14"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [],
+			"key": "libc6_2.36-9-p-deb12u9_arm64",
+			"name": "libc6",
+			"sha256": "564ad8beb7d6d80620ed5f6387cd0da5e3bc839e0c43293b4233678e8366c283",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/g/glibc/libc6_2.36-9+deb12u9_arm64.deb",
+			"version": "2.36-9+deb12u9"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [],
+			"key": "gcc-12-base_12.2.0-14_arm64",
+			"name": "gcc-12-base",
+			"sha256": "e1f2fb7212546c0e360af8df26303608f7b09e123ac9c96e15872d1ec1ce3275",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/g/gcc-12/gcc-12-base_12.2.0-14_arm64.deb",
+			"version": "12.2.0-14"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [
+				{
+					"key": "libgcc-s1_12.2.0-14_arm64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "libc6_2.36-9-p-deb12u9_arm64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_arm64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "libstdc-p--p-6_12.2.0-14_arm64",
+			"name": "libstdc++6",
+			"sha256": "21e971c5d3506f783b89efe8e12ac85081ddd9213e4f6529262bcfe95c326670",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/g/gcc-12/libstdc++6_12.2.0-14_arm64.deb",
+			"version": "12.2.0-14"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_arm64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_arm64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_arm64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "zlib1g_1-1.2.13.dfsg-1_arm64",
+			"name": "zlib1g",
+			"sha256": "52b8b8a145bbe1956bba82034f77022cbef0c3d0885c9e32d9817a7932fe1913",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/z/zlib/zlib1g_1.2.13.dfsg-1_arm64.deb",
+			"version": "1:1.2.13.dfsg-1"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_arm64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_arm64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_arm64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "libtinfo6_6.4-4_arm64",
+			"name": "libtinfo6",
+			"sha256": "baef0f6776f84c7eed4f1146d6e5774689567dad43216894d41da02e6608e4b3",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/n/ncurses/libtinfo6_6.4-4_arm64.deb",
+			"version": "6.4-4"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [
+				{
+					"key": "debianutils_5.7-0.5_deb12u1_arm64",
+					"name": "debianutils",
+					"version": "5.7-0.5~deb12u1"
+				},
+				{
+					"key": "libc6_2.36-9-p-deb12u9_arm64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_arm64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_arm64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "base-files_12.4-p-deb12u8_arm64",
+					"name": "base-files",
+					"version": "12.4+deb12u8"
+				},
+				{
+					"key": "libtinfo6_6.4-4_arm64",
+					"name": "libtinfo6",
+					"version": "6.4-4"
+				}
+			],
+			"key": "bash_5.2.15-2-p-b7_arm64",
+			"name": "bash",
+			"sha256": "621063473b58c9d29ad29fd98e7344d2d0451f70f34651d6ea9de03e17821701",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/b/bash/bash_5.2.15-2+b7_arm64.deb",
+			"version": "5.2.15-2+b7"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [],
+			"key": "debianutils_5.7-0.5_deb12u1_arm64",
+			"name": "debianutils",
+			"sha256": "0fc03c548293aee2359af53bd03b30ab42ca3493afcb65bed2f3caee90ffd46a",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/d/debianutils/debianutils_5.7-0.5~deb12u1_arm64.deb",
+			"version": "5.7-0.5~deb12u1"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [],
+			"key": "base-files_12.4-p-deb12u8_arm64",
+			"name": "base-files",
+			"sha256": "04cde0acde0b505e69db229bc285fbb73e75f25a61a23369e837dd56e19d3448",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/b/base-files/base-files_12.4+deb12u8_arm64.deb",
+			"version": "12.4+deb12u8"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [
+				{
+					"key": "libcrypt1_1-4.4.33-2_arm64",
+					"name": "libcrypt1",
+					"version": "1:4.4.33-2"
+				},
+				{
+					"key": "libc6_2.36-9-p-deb12u9_arm64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_arm64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_arm64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "toybox_0.8.9-p-dfsg-1_arm64",
+			"name": "toybox",
+			"sha256": "e423df000adb9b94af807d5c4297a625ec887677334d72e4a258df23f9616d7a",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/t/toybox/toybox_0.8.9+dfsg-1_arm64.deb",
+			"version": "0.8.9+dfsg-1"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_arm64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_arm64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_arm64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "libcrypt1_1-4.4.33-2_arm64",
+			"name": "libcrypt1",
+			"sha256": "eea0ad76ea5eb507127fea0c291622ea4ecdbb71c4b9a8ed9c76ae33fc1a0127",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/libx/libxcrypt/libcrypt1_4.4.33-2_arm64.deb",
+			"version": "1:4.4.33-2"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [
+				{
+					"key": "libc6_2.36-9-p-deb12u9_arm64",
+					"name": "libc6",
+					"version": "2.36-9+deb12u9"
+				},
+				{
+					"key": "libgcc-s1_12.2.0-14_arm64",
+					"name": "libgcc-s1",
+					"version": "12.2.0-14"
+				},
+				{
+					"key": "gcc-12-base_12.2.0-14_arm64",
+					"name": "gcc-12-base",
+					"version": "12.2.0-14"
+				}
+			],
+			"key": "busybox_1-1.35.0-4-p-b3_arm64",
+			"name": "busybox",
+			"sha256": "12ff3f0c05fb0cef5307a1809cd64ce167c27dac122753d035c755112441cd50",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/pool/main/b/busybox/busybox_1.35.0-4+b3_arm64.deb",
+			"version": "1:1.35.0-4+b3"
+		},
+		{
+			"arch": "arm64",
+			"dependencies": [],
+			"key": "linux-libc-dev_6.1.119-1_arm64",
+			"name": "linux-libc-dev",
+			"sha256": "d0465ddf80ebe80a49a5928bb8a93a8dfefb14272f0569f9213949677a2d6d9a",
+			"url": "https://snapshot-cloudflare.debian.org/archive/debian-security/20241205T083717Z/pool/updates/main/l/linux/linux-libc-dev_6.1.119-1_arm64.deb",
+			"version": "6.1.119-1"
+		}
+	],
+	"version": 1
+}
\ No newline at end of file
--- a/bazelisk/packages.yaml
+++ b/bazelisk/packages.yaml
+version: 1
+
+sources:
+  - channel: bookworm main contrib
+    url: https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/
+  - channel: bookworm-security main
+    url: https://snapshot-cloudflare.debian.org/archive/debian-security/20241205T083717Z/
+  - channel: bookworm-updates main
+    url: https://snapshot-cloudflare.debian.org/archive/debian/20241205T083717Z/
+
+archs:
+  - "amd64"
+  - "arm64"
+
+packages:
+  - "libgcc-s1"
+  - "libstdc++6"
+  - "zlib1g"
+  - "libtinfo6"
+  - "bash"
+  - "toybox"
+  - "libcrypt1"
+  - "busybox"
+  - "linux-libc-dev"
--- a/e2e/.bazelrc
+++ b/e2e/.bazelrc
+# Build cache
+build --experimental_guard_against_concurrent_changes
+
+# Prevent `PATH` and `LD_LIBRARY_PATH` leaking into action enviroment
+build --incompatible_strict_action_env
+
+# Prevent symlink forest under `.runfiles/wsname/external/repo`
+build --nolegacy_external_runfiles
+
+# Avoid building all targets when testing
+test --build_tests_only
+
+# Print relative paths where possible to reduce noise
+common --attempt_to_print_relative_paths
+
+# Enable hermetic `rules_python`
+common --@rules_python//python/config_settings:bootstrap_impl=script
+
+# User-specific .bazelrc
+try-import %workspace%/.bazelrc.user
--- a/e2e/.bazelrc.ci
+++ b/e2e/.bazelrc.ci
+# Declare all run commands that are loaded
+common --announce_rc
+
+# Use relative paths where possible for concise CI output
+common --attempt_to_print_relative_paths
+
+# Prevent progress bars or similar
+common --curses=no
+
+# CI "terminals" support colour
+common --color=yes
+
+# Output timestamps for each command to aid debugging of CI runtime
+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
+
+# Noisy logs but allows debugging CI run failures
+test --test_output=errors
+
+# Output as much information when a test exceeds a timeout
+test --test_verbose_timeout_warnings
+
+# These locations are cached on the CI
+build --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk
+build --repository_cache=${CI_PROJECT_DIR}/.cache/bazel/repo
+
+# Here to dogfood the `ruleset` component
+build:local --enable_bzlmod
--- a/e2e/.bazelversion
+++ b/e2e/.bazelversion
+7.4.0
--- a/e2e/.gitignore
+++ b/e2e/.gitignore
+/.cache
+/bazel-e2e
+/bazel-out
+/bazel-bin
+/bazel-testlogs
+/.bazelrc.user
+/node_modules
--- a/e2e/BUILD.bazel
+++ b/e2e/BUILD.bazel
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+
+build_test(
+    name = "public",
+    targets = [
+        "@bazelisk//bazelisk:image",
+        "@bazelisk//bazelisk:images",
+    ],
+)
--- a/e2e/MODULE.bazel
+++ b/e2e/MODULE.bazel
+module(
+    name = "e2e",
+)
+
+bazel_dep(name = "rules_python", version = "0.34.0", dev_dependency=True)
+bazel_dep(name = "bazel_skylib", version = "1.7.1")
+bazel_dep(name = "bazelisk")
+local_path_override(
+    module_name = "bazelisk",
+    path = "..",
+)
+
+# We have to avoid the `chmod`/`chown`/`id` unhermetic-ness
+# TODO: remove this when `ignore_root_user_error` is hermetic
+# https://github.com/bazelbuild/rules_python/issues/2016
+dev = use_extension("@rules_python//python/extensions:python.bzl", "python", dev_dependency = True)
+dev.toolchain(
+    configure_coverage_tool = True,
+    # TODO: change the code to use Python for `chmod`/`id`
+    ignore_root_user_error = True,
+    python_version = "3.11",
+)
+
--- a/e2e/MODULE.bazel.lock
+++ b/e2e/MODULE.bazel.lock
--- a/templates/bazelisk.yml
+++ b/templates/bazelisk.yml
@@ -4,7 +4,7 @@ spec:
      default: registry.gitlab.arm.com/ci/component/bazelisk
      description: "Open container image (OCI) to use."
    tag:
-      default: 1.0.0-beta.6
+      default: 1.0.0-beta.7
      description: "Open container image (OCI) tag for the image."
    stage:
      default: test

--- a/templates/ruleset/.job.yml
+++ b/templates/ruleset/.job.yml
@@ -4,7 +4,7 @@ spec:
      default: registry.gitlab.arm.com/ci/component/bazelisk
      description: "Open container image (OCI) to use."
    tag:
-      default: 1.0.0-beta.6
+      default: 1.0.0-beta.7
      description: "Open container image (OCI) tag for the image."
    config:
      default: local

--- a/templates/ruleset/config.yml
+++ b/templates/ruleset/config.yml
@@ -4,8 +4,24 @@ spec:
      default: registry.gitlab.arm.com/ci/component/bazelisk
      description: "Open container image (OCI) to use."
    tag:
-      default: 1.0.0-beta.6
+      default: 1.0.0-beta.7
      description: "Open container image (OCI) tag for the image."
+    needs:
+      type: array
+      default: []
+      description: "Jobs to run before the `config` job."
+    configs:
+      type: array
+      default:
+        - local
+        - remote
+      description: "Bazel run command configurations to test."
+    roots:
+      type: array
+      default:
+        - .
+        - e2e
+      description: "Root directories of Bazel modules to test."
 ---
 include:
  - local: "/templates/ruleset/.job.yml"
@@ -15,11 +31,8 @@ include:

 config:
  extends: .job
+  needs: $[[inputs.needs]]
  parallel:
    matrix:
-      - ROOT:
-          - .
-          - e2e
-        CONFIG:
-          - local
-          - remote
+      - ROOT: $[[inputs.roots]]
+        CONFIG: $[[inputs.configs]]
--- a/templates/ruleset/semantic-release.yml
+++ b/templates/ruleset/semantic-release.yml
@@ -4,7 +4,7 @@ spec:
      default: registry.gitlab.arm.com/ci/component/bazelisk
      description: "Open container image (OCI) to use."
    tag:
-      default: 1.0.0-beta.6
+      default: 1.0.0-beta.7
      description: "Open container image (OCI) tag for the image."
    needs:
      type: array

--- a/templates/ruleset/template.yml
+++ b/templates/ruleset/template.yml
@@ -4,31 +4,52 @@ spec:
      default: registry.gitlab.arm.com/ci/component/bazelisk
      description: "Open container image (OCI) to use."
    tag:
-      default: 1.0.0-beta.6
+      default: 1.0.0-beta.7
      description: "Open container image (OCI) tag for the image."
    minimum:
      default: 7.4.0
      description: "The minimum Bazel version tested."
      regex: ^\d+\.\d+\.\d+$
    needs:
+      type: array
+      default: []
+      description: "Jobs to run before the testing jobs."
+    roots:
+      type: array
+      default:
+        - .
+        - e2e
+      description: "Root directories of Bazel modules to test."
+    configs:
+      type: array
+      default:
+        - local
+        - remote
+      description: "Bazel run command configurations to test."
+    versions:
      type: array
      default:
-        - config
-        - version
-      description: "Jobs to run before the `semantic-release` job."
+        - 7.4.0
+        - 7.x
+        - last_rc
+      description: "The Bazel versions tested."
 ---
 include:
  - local: "/templates/ruleset/version.yml"
    inputs:
      image: "$[[inputs.image]]"
      tag: "$[[inputs.tag]]"
-      minimum: "$[[inputs.minimum]]"
+      needs: $[[inputs.needs]]
+      roots: $[[inputs.roots]]
+      versions: $[[inputs.versions]]
  - local: "/templates/ruleset/config.yml"
    inputs:
      image: "$[[inputs.image]]"
      tag: "$[[inputs.tag]]"
+      needs: $[[inputs.needs]]
+      configs: $[[inputs.configs]]
+      roots: $[[inputs.roots]]
  - local: "/templates/ruleset/semantic-release.yml"
    inputs:
      image: "$[[inputs.image]]"
      tag: "$[[inputs.tag]]"
-      needs: $[[inputs.needs]]
No results found