.bazelrc.ci

@@ -26,7 +26,7 @@ test --test_output=errors
 test --test_verbose_timeout_warnings
 
 # Validate that the lockfile is correct
-common --lockfile_mode=error
+common --lockfile_mode=${CI_LOCKFILE_MODE}
 
 # These locations are cached on the CI
 build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk

.gitlab-ci.yml

@@ -14,36 +14,58 @@ include:
         CI_COMMIT_REF_NAME
         CI_COMMIT_SHA
         CI_SERVER_HOST
+        CI_LOCKFILE_MODE
 
 default:
   tags:
     - arm64
 
-test:
+.test:
   extends: .bazelisk
   cache:
     - !reference [.bazelisk, cache]
     - key: "bazel-cache-${CI_PROJECT_ID}"
       paths:
-      - ".cache/bazel/disk"
-      - ".cache/bazel/repo"
+        - ".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
+          - .
+          - e2e
         CONFIG:
-        - local
-        - remote
-  script:
-    - cd "${ROOT}"; bazelisk test --config="${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
-  extends: .bazelisk
   needs:
-    - test
+    - config
+    - version
   image: node:lts
   cache:
     key:

CHANGELOG.md

+# [1.0.0-beta.4](https://git.gitlab.arm.com/bazel/download_utils/compare/v1.0.0-beta.3...v1.0.0-beta.4) (2024-11-04)
+
+### Bug Fixes
+
+- **commands:** add Bazel 8 `+` separator support ([8f191be](https://git.gitlab.arm.com/bazel/download_utils/commit/8f191be671e12e9e6485179b27f4b462be4a0a61))
+
 # [1.0.0-beta.3](https://git.gitlab.arm.com/bazel/download_utils/compare/v1.0.0-beta.2...v1.0.0-beta.3) (2024-11-04)
 
 ### Bug Fixes

MODULE.bazel

 module(
     name = "download_utils",
-    version = "1.0.0-beta.3",
+    version = "1.0.0-beta.4",
     bazel_compatibility = [
         ">=7.1.0",
     ],
@@ -9,3 +9,7 @@ module(
 
 bazel_dep(name = "rules_diff", version = "1.0.0-beta.5", dev_dependency = True)
 bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.17", dev_dependency = True)
+
+separator = use_repo_rule("//lib:separator.bzl", "separator")
+
+separator(name = "separator")

e2e/.bazelrc.ci

@@ -26,7 +26,7 @@ test --test_output=errors
 test --test_verbose_timeout_warnings
 
 # Validate that the lockfile is correct
-common --lockfile_mode=error
+common --lockfile_mode=${CI_LOCKFILE_MODE}
 
 # These locations are cached on the CI
 build:local --disk_cache=${CI_PROJECT_DIR}/.cache/bazel/disk

lib/commands.bzl

+load(":separator.bzl", "SEPARATOR")
+
 visibility("//download/...")
 
 ATTRS = {
@@ -54,8 +56,8 @@ def commands(rctx):
         return {}
 
     def _label(label):
-        prefix, _ = rctx.name.rsplit("~", 1)
-        prefix += "~"
+        prefix, _ = rctx.name.rsplit(SEPARATOR, 1)
+        prefix += SEPARATOR
         workspace = label.workspace_name.removeprefix(prefix)
         package = label.package
         name = label.name

lib/separator.bzl

+visibility("//...")
+
+SEPARATOR = Label("@separator").workspace_name.removesuffix("separator")[-1]
+
+def _impl(_):
+    pass
+
+separator = repository_rule(implementation = _impl)