.bazelrc.ci

@@ -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

.gitlab-ci.yml

 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/bazelisk@v1.0.0-beta.4"
-    inputs:
-      variables: |
-        CI_PROJECT_DIR
-        CI_PROJECT_ID
-        CI_REMOTE_EXECUTOR
-        CI_REMOTE_CACHE
-        CI_REMOTE_HEADER
-        CI_REMOTE_JOBS
-        CI_BES_RESULTS_URL
-        CI_BES_BACKEND
-        CI_PROJECT_URL
-        CI_COMMIT_REF_NAME
-        CI_COMMIT_SHA
-        CI_SERVER_HOST
-        CI_LOCKFILE_MODE
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.0.0-beta.6"
 
 default:
   tags:
     - arm64
-
-.test:
-  extends: .bazelisk
-  cache:
-    - !reference [.bazelisk, cache]
-    - key: "bazel-cache-${CI_PROJECT_ID}"
-      paths:
-        - ".cache/bazel/disk"
-        - ".cache/bazel/repo"
-  variables:
-    CI_LOCKFILE_MODE: error
-    CONFIG: local
-  script:
-    - (cd "${ROOT}"; bazelisk test --config="${CONFIG}" //...)
-
-config:
-  extends: .test
-  parallel:
-    matrix:
-      - ROOT:
-          - .
-          - e2e
-        CONFIG:
-          - local
-          - remote
-
-version:
-  extends: .test
-  variables:
-    CI_LOCKFILE_MODE: "off"
-  parallel:
-    matrix:
-      - ROOT:
-          - .
-          - e2e
-        USE_BAZEL_VERSION:
-          - 7.1.0
-          - 7.x
-          - last_rc
-
-# TODO: switch this out for `rules_semantic_release`
-semantic-release:
-  extends: .test
-  stage: .post
-  needs:
-    - config
-    - version
-  image: node:lts
-  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"

CHANGELOG.md

+# [1.0.0-beta.19](https://git.gitlab.arm.com/bazel/toolchain_utils/compare/v1.0.0-beta.18...v1.0.0-beta.19) (2024-12-04)
+
+### Bug Fixes
+
+- strip output of `uname -r` ([4de6058](https://git.gitlab.arm.com/bazel/toolchain_utils/commit/4de60581787b6ae1a8694d673080042ac8cc7bac))
+
 # [1.0.0-beta.18](https://git.gitlab.arm.com/bazel/toolchain_utils/compare/v1.0.0-beta.17...v1.0.0-beta.18) (2024-11-20)
 
 ### Bug Fixes

MODULE.bazel

 module(
     name = "toolchain_utils",
-    version = "1.0.0-beta.18",
+    version = "1.0.0-beta.19",
     bazel_compatibility = [
         ">=7.1.0",
     ],

e2e/.bazelrc.ci

@@ -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

toolchain/local/triplet/os.bzl

@@ -114,7 +114,7 @@ def _uname(rctx, path):
     if result.return_code != 0:
         fail("Failed to get `uname` release: {}".format(result.stderr))
 
-    version = result.stdout.split("-", 1)[0]
+    version = result.stdout.strip().split("-", 1)[0]
 
     major, minor, patch = split(version, ".", {
         3: lambda x, y, z: (x, y, z),