.bazelrc

@@ -10,5 +10,8 @@ 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
+
 # User-specific .bazelrc
 try-import %workspace%/.bazelrc.user

.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

.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.5"
     inputs:
       variables: |
         CI_PROJECT_DIR
@@ -21,6 +21,12 @@ default:
 
 test:
   extends: .bazelisk
+  cache:
+    - !reference [.bazelisk, cache]
+    - key: "bazel-cache-${CI_PROJECT_ID}"
+      paths:
+      - ".cache/bazel/disk"
+      - ".cache/bazel/repo"
   parallel:
     matrix:
       - ROOT:
@@ -35,6 +41,7 @@ test:
 # TODO: switch this out for `rules_semantic_release`
 semantic-release:
   stage: .post
+  extends: .bazelisk
   needs:
     - test
   image: node:lts
@@ -49,8 +56,8 @@ semantic-release:
   before_script:
     - npm config --location project set cache "${CI_PROJECT_DIR}/.cache/npm"
     - npm ci --prefer-offline
+    - !reference [.bazelisk, before_script]
   script:
-    - !reference [.bazelisk-fragment, rc]
     - npx semantic-release
   rules:
     - if: $CI_COMMIT_TAG

CHANGELOG.md

+# [1.0.0-beta.14](https://git.gitlab.arm.com/bazel/ape/compare/v1.0.0-beta.13...v1.0.0-beta.14) (2024-10-30)
+
+### Bug Fixes
+
+- upgrade `toolchain_utils@1.0.0-beta.17` for Bazel 8+ support ([798f061](https://git.gitlab.arm.com/bazel/ape/commit/798f06125affc958172882443f827c4a9194311b))
+
+### Features
+
+- upgrade to `3.7.1` binaries ([ac2753e](https://git.gitlab.arm.com/bazel/ape/commit/ac2753e15fbef915ee3ecdd220efe76201e4e2fd))
+
 # [1.0.0-beta.13](https://git.gitlab.arm.com/bazel/ape/compare/v1.0.0-beta.12...v1.0.0-beta.13) (2024-07-26)
 
 ### Bug Fixes

CODEOWNERS

-* @bazel
+* @matthew.clarkson
 
 # TODO: update sections with relevant people
 

CONTRIBUTING.md

@@ -22,3 +22,22 @@ release.
 
 [semrel-release-channels-usage]:
   https://gitlab.arm.com/semantic-release/config-release-channels/-/blob/main/README.md?ref_type=heads#usage
+
+# Upgrading Binaries
+
+The following script can be ran in a POSIX shell:
+
+```console
+# Clear out all integrities
+sed -i 's|"\([a-z0-9-]\+\)": "sha256.\+",|"\1": "",|g' MODULE.bazel
+# Run a fetch and update integrity
+for BINARY in $(rg --no-line-number '^ +"([a-z0-9]+)": "",' -or '$1' MODULE.bazel); do
+  INTEGRITY="$(bazelisk fetch @${BINARY}//:entrypoint 2>&1 | rg -o 'sha256-[^"]+')"
+  echo "${BINARY}: ${INTEGRITY}"
+  sed -i "s|\"${BINARY}\": \"\",|\"${BINARY}\": \"${INTEGRITY}\",|" MODULE.bazel
+done
+# Upload all binaries
+for TARGET in $(bazelisk query 'upload:*' | tail -n +2); do
+    bazelisk run "${TARGET}"
+done
+```

ape/assimilate/rule.bzl

@@ -104,7 +104,7 @@ def _assimilate(ctx, executable):
         arguments = [args],
         mnemonic = "ApeAssimilate",
         progress_message = "assimilating %{input}",
-        toolchain = "//ape/toolchain/assimilate:type",
+        toolchain = "//ape/toolchain/ape:type",
     )
 
     return ctx.runfiles([executable])

ape/toolchain/macro.bzl

@@ -15,7 +15,7 @@ def toolchain(*, name, toolchain, toolchain_type, exec_compatible_with = (), tar
 
     ape_toolchain(
         name = "ape",
-        toolchain = "@ape//:curl",
+        toolchain = "@ape//ape/toolchain:curl",
         toolchain_type = ":type",
     )
     ```

e2e/.bazelrc

@@ -10,5 +10,8 @@ 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
+
 # User-specific .bazelrc
 try-import %workspace%/.bazelrc.user

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

upload/BUILD.bazel

@@ -7,7 +7,7 @@ load("//:binaries.bzl", "BINARIES")
         src = "@{}//:ape".format(ape),
         dst = ape,
         tags = ["manual"],
-        url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.3.1",
+        url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.7.1",
     )
     for ape in (
         "ape-arm64.elf",
@@ -22,7 +22,7 @@ load("//:binaries.bzl", "BINARIES")
         src = "@cosmos-{}//:{}".format(binary, binary),
         dst = binary,
         tags = ["manual"],
-        url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.3.1",
+        url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.7.1",
     )
     for binary in BINARIES
 ]
@@ -32,5 +32,5 @@ curl_upload_file(
     src = "@ape-m1.c",
     dst = "ape-m1.c",
     tags = ["manual"],
-    url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.3.1",
+    url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/3.7.1",
 )