.gitlab-ci.yml

@@ -11,6 +11,8 @@ include:
         - local
       versions:
         - 7.0.0
+      oses:
+        - linux
 
 default:
   tags:

.releaserc.yaml

@@ -24,6 +24,10 @@ plugins:
         frontMatter: "process"
         expression: |-
           .spec.inputs.tag.default = "${nextRelease.version}"
+      - filepath: "templates/ruleset/os.yml"
+        frontMatter: "process"
+        expression: |-
+          .spec.inputs.tag.default = "${nextRelease.version}"
       - filepath: "templates/ruleset/version.yml"
         frontMatter: "process"
         expression: |-
@@ -46,6 +50,7 @@ plugins:
       - "CHANGELOG.md"
       - "templates/bazelisk.yml"
       - "templates/ruleset/.job.yml"
+      - "templates/ruleset/os.yml"
       - "templates/ruleset/version.yml"
       - "templates/ruleset/config.yml"
       - "templates/ruleset/template.yml"

CHANGELOG.md

+## [1.0.1](https://git.gitlab.arm.com/ci/component/bazelisk/compare/v1.0.0...v1.0.1) (2024-12-10)
+
+### Bug Fixes
+
+- add CI executable architecture/OS to the cache key ([0c63cbe](https://git.gitlab.arm.com/ci/component/bazelisk/commit/0c63cbeea2e46f3928aa243ae26d13dc3b91d569))
+- **ruleset:** make disk/repo cache host arch/os specific ([3ff5a78](https://git.gitlab.arm.com/ci/component/bazelisk/commit/3ff5a7802890107258094bda3713f82d78bf7e0d))
+- support testing on multiple operating systems ([0fe682f](https://git.gitlab.arm.com/ci/component/bazelisk/commit/0fe682fc005c49b7f9774e175f0eaf6f5080fd35))
+- upgrade `bazelisk` to `1.24.1` ([65799b9](https://git.gitlab.arm.com/ci/component/bazelisk/commit/65799b9e6298918432ca5084ba924a3972e0ff5c))
+
 # 1.0.0 (2024-12-06)
 
 ### Bug Fixes

MODULE.bazel

 module(
     name = "bazelisk",
-    version = "1.0.0",
+    version = "1.0.1",
     bazel_compatibility = [
         ">=7.0.0",
     ],
@@ -59,8 +59,8 @@ download_file = use_repo_rule("@download_utils//download/file:defs.bzl", "downlo
         ],
     )
     for cpu, os, version, integrity in (
-        ("amd64", "linux", "1.19.0", "sha256-0otYisCRar1r8C3vtUM/bt33y6Nf+oCOq7ZaRKqyJvc="),
-        ("arm64", "linux", "1.19.0", "sha256-hhoWupl5YT5wvT0vnZq147Wf55RxxXU6zcnEMatsnZQ="),
+        ("amd64", "linux", "1.24.1", "sha256-Cu4JxxgosAEnUMubaJzjV12o4jDyZb+Nbc1FTu5uqEI="),
+        ("arm64", "linux", "1.24.1", "sha256-Kg5dOX9929rB3v9BZ8doHZ0dAlxd+pecKzfwkfAy0Bo="),
     )
 ]
 

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
+      default: 1.0.1
       description: "Open container image (OCI) tag for the image."
     stage:
       default: test
@@ -28,7 +28,7 @@ spec:
       default: .
       description: "The root directory of the Bazel module."
     key:
-      default: "bazelisk-1"
+      default: "bazelisk-${CI_RUNNER_EXECUTABLE_ARCH}-1"
       description: "The GitLab CI cache key."
     variables:
       default: |

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
+      default: 1.0.1
       description: "Open container image (OCI) tag for the image."
     config:
       default: local
@@ -43,7 +43,7 @@ include:
   extends: .bazelisk
   cache:
     - !reference [.bazelisk, cache]
-    - key: "bazel-cache-${CI_PROJECT_ID}"
+    - key: "bazel-cache-${CI_RUNNER_EXECUTABLE_ARCH}-${CI_PROJECT_ID}"
       paths:
         - ".cache/bazel/disk"
         - ".cache/bazel/repo"

templates/ruleset/config.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
+      default: 1.0.1
       description: "Open container image (OCI) tag for the image."
     needs:
       type: array

templates/ruleset/os.yml

+spec:
+  inputs:
+    image:
+      default: registry.gitlab.arm.com/ci/component/bazelisk
+      description: "Open container image (OCI) to use."
+    tag:
+      default: 1.0.1
+      description: "Open container image (OCI) tag for the image."
+    needs:
+      type: array
+      default: []
+      description: "Jobs to run before the `version` job."
+    roots:
+      type: array
+      default:
+        - .
+        - e2e
+      description: "Root directories of Bazel modules to test."
+    oses:
+      type: array
+      default:
+        - linux
+        - windows
+      description: "The operating systems to test on."
+---
+include:
+  - local: "/templates/ruleset/.job.yml"
+    inputs:
+      image: "$[[inputs.image]]"
+      tag: "$[[inputs.tag]]"
+
+os:
+  extends: .job
+  needs: $[[inputs.needs]]
+  variables:
+    CI_LOCKFILE_MODE: "off"
+  tags:
+    - "${OS}"
+  parallel:
+    matrix:
+      - ROOT: $[[inputs.roots]]
+        OS: $[[inputs.oses]]

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
+      default: 1.0.1
       description: "Open container image (OCI) tag for the image."
     needs:
       type: array

templates/ruleset/template.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
+      default: 1.0.1
       description: "Open container image (OCI) tag for the image."
     minimum:
       default: 7.4.0
@@ -33,6 +33,12 @@ spec:
         - 7.x
         - last_rc
       description: "The Bazel versions tested."
+    oses:
+      type: array
+      default:
+        - linux
+        - windows
+      description: "The operating systems to test on."
 ---
 include:
   - local: "/templates/ruleset/version.yml"
@@ -47,8 +53,15 @@ include:
       image: "$[[inputs.image]]"
       tag: "$[[inputs.tag]]"
       needs: $[[inputs.needs]]
+      roots: $[[inputs.roots]]
       configs: $[[inputs.configs]]
+  - local: "/templates/ruleset/os.yml"
+    inputs:
+      image: "$[[inputs.image]]"
+      tag: "$[[inputs.tag]]"
+      needs: $[[inputs.needs]]
       roots: $[[inputs.roots]]
+      oses: $[[inputs.oses]]
   - local: "/templates/ruleset/semantic-release.yml"
     inputs:
       image: "$[[inputs.image]]"

templates/ruleset/version.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
+      default: 1.0.1
       description: "Open container image (OCI) tag for the image."
     needs:
       type: array