.gitlab-ci.yml

 include:
-  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.0.0"
+  - component: "${CI_SERVER_HOST}/ci/component/bazelisk/ruleset@v1.2.0"
 
 default:
   tags:

CHANGELOG.md

+# [1.0.0-beta.18](https://git.gitlab.arm.com/bazel/ape/compare/v1.0.0-beta.17...v1.0.0-beta.18) (2025-01-21)
+
+### Features
+
+- upgrade binaries to `cosmo.zip@4.0.2` ([9da564c](https://git.gitlab.arm.com/bazel/ape/commit/9da564c449ae2641c4a8145051ac5f80f6ac3734))
+
 # [1.0.0-beta.17](https://git.gitlab.arm.com/bazel/ape/compare/v1.0.0-beta.16...v1.0.0-beta.17) (2025-01-06)
 
 ### Bug Fixes

CONTRIBUTING.md

@@ -20,23 +20,71 @@ $ (cd e2e; bazelisk test //...)
 
 # Upgrading Binaries
 
-The following script can be ran in a POSIX shell:
+First off take a look at the cosmos repo for the new release and determine whether any
+of the binaries which are in the sections with this text:
+`# TODO: remove these when future versions make them available`
+appear in the new release. If so remove them from their previous download section and either
+uncomment or add them to the download binaries for the new release.
 
+## Generating new SHAs
+
+Next up you will need to replace the urls in the download_file invocations to point to the new release.
+
+It should just be a find and replace of the version number for those urls.
+
+You may also need to comment out the first url for these new downloads, so that they go to cosmos
+rather than our internal gitlab package registry.
+
+Then run following script in a POSIX shell:
 ```console
 # Clear out all integrities
-sed -i 's|"\([a-z0-9-]\+\)": "sha256.\+",|"\1": "",|g' MODULE.bazel
+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
+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
+```
+
+You should now have all the sha's generated for the new release, if there are any sha's that don't
+appear then it's possible they are not in the current release. So you will need to add that to a
+new `# <old version> downloads` section. Then comment out that binary from the new binaries
+download target.
+
+If at any point you want to re-generate these sha's you will need to run `bazel clean --expunge`
+to clear out the cached downloads.
+
+## Uploading a new Package to Gitlab
+
+Finally once you're happy with the sha's that have been generated you want to upload these to the
+internal gitlab package registry.
+
+First of all you will want to modify the url's in
+`upload/BUILD.bazel` to point to the new release version, and run this in a POSIX shell:
+
+```console
 # Upload all binaries
 for TARGET in $(bazelisk query 'upload:*' | tail -n +2); do
     bazelisk run "${TARGET}"
 done
 ```
 
+Now you can check the package registry to ensure a new package entry is there for the new version.
+
+If at this point there are no new versions, you may want to ensure that your `~/.netrc` file is
+setup for access to gitlab using a personal access token, and try again.
+
+Finally ensure all the gitlab package registry urls in `MODULE.bazel` are uncommented so that they
+can be used as a mirror going forward.
+
+## Confirming Correct SHA's
+One final check you can do is to comment out all the external urls in `MODULE.bazel` for the new
+cosmo version to ensure it only retrieves the packages from the Gitlab Package Registry.
+
+Then run `bazel clean --expunge` before re-running the commands from [Generating new SHA's](#generating-new-shas) then you should have no change to the `MODULE.bazel` file, other than your commented out urls.
+
+
 # Release
 
 `semantic-release` performs automatic releases of the project.

binaries.bzl

@@ -23,6 +23,7 @@ BINARIES = (
     "cmp",
     "comm",
     "cp",
+    "cpuid",
     "csplit",
     "ctags",
     "curl",
@@ -62,11 +63,13 @@ BINARIES = (
     "less",
     "life",
     "link",
+    "links",
     "ln",
     "locate",
     "logname",
     "ls",
     "lua",
+    "lz4",
     "make",
     "md5sum",
     "mv",
@@ -96,6 +99,7 @@ BINARIES = (
     "printimage",
     "ptx",
     "pwd",
+    "pypack1",
     "python",
     "qjs",
     "readlink",
@@ -141,6 +145,7 @@ BINARIES = (
     "tty",
     "ttyinfo",
     "uname",
+    "unbourne",
     "unexpand",
     "uniq",
     "unlink",

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.9.2",
+        url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2",
     )
     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.9.2",
+        url = "https://gitlab.arm.com/api/v4/projects/bazel%2Fape/packages/generic/cosmos.zip/4.0.2",
     )
     for binary in BINARIES
 ]