BUILD.bazel

@@ -22,6 +22,7 @@
         "chroot",
         "cksum",
         "clang-format",
+        "cmp",
         "comm",
         "csplit",
         "ctags",
@@ -31,6 +32,8 @@
         "datasette",
         "date",
         "df",
+        "diff",
+        "diff3",
         "dir",
         "dircolors",
         "dirname",
@@ -78,6 +81,7 @@
         "numfmt",
         "od",
         "paste",
+        "patch",
         "pathchk",
         "pigz",
         "pinky",
@@ -96,6 +100,7 @@
         "rsync",
         "runcon",
         "script",
+        "sdiff",
         "sed",
         "seq",
         "sha1sum",

CHANGELOG.md

+# [1.0.0-alpha.2](https://git.gitlab.arm.com/bazel/ape/compare/v1.0.0-alpha.1...v1.0.0-alpha.2) (2024-02-19)
+
+### Features
+
+- add `diff`, `diff3`, `sdiff`, `cmp` and `patch` ([a49565d](https://git.gitlab.arm.com/bazel/ape/commit/a49565d57425470e12d74a42e1f481bb70543ded))
+
 # 1.0.0-alpha.1 (2024-02-14)
 
 ### Features

MODULE.bazel

 module(
     name = "ape",
-    version = "1.0.0-alpha.1",
+    version = "1.0.0-alpha.2",
     bazel_compatibility = [
         ">=7.0.0",
     ],
@@ -10,6 +10,8 @@ module(
 bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.1")
 bazel_dep(name = "download_utils", version = "1.0.0-beta.1")
 
+download_archive = use_repo_rule("@download_utils//download/archive:defs.bzl", "download_archive")
+
 download_file = use_repo_rule("@download_utils//download/file:defs.bzl", "download_file")
 
 [
@@ -217,3 +219,31 @@ export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain
         "zstd": "sha256-NBtbg/4vD4sgHfqxK9DiUzdtJgu3+lER8GYZ8irR40E=",
     }.items()
 ]
+
+# Switch these to `cosmo.zip` when they are added
+download_archive(
+    name = "cli",
+    srcs = ["bin/*"],
+    integrity = "sha256-ky+wwBWUS38eUFu5O3q/w7S2l7UGSJEDZAuYLmKGjc8=",
+    urls = ["https://github.com/ahgamut/superconfigure/releases/download/z0.0.33/cli.zip"],
+)
+
+[
+    (
+        ape_entrypoint(
+            name = binary,
+            binary = "@cli//:bin/{}".format(binary),
+        ),
+        export.symlink(
+            name = "ape-{}".format(binary),
+            target = "@{}".format(binary),
+        ),
+    )
+    for binary in (
+        "diff",
+        "diff3",
+        "sdiff",
+        "cmp",
+        "patch",
+    )
+]

ape/test/BUILD.bazel

@@ -18,6 +18,7 @@ alias(
 [
     test(
         name = binary,
+        size = "small",
         arguments = arguments,
         target = "//:{}".format(binary),
     )
@@ -39,6 +40,7 @@ alias(
         "chroot": ["--version"],
         "cksum": ["--version"],
         "clang-format": ["--version"],
+        "cmp": ["--version"],
         "comm": ["--version"],
         "csplit": ["--version"],
         "ctags": ["--version"],
@@ -48,6 +50,8 @@ alias(
         "datasette": ["--version"],
         "date": ["--version"],
         "df": ["--version"],
+        "diff": ["--version"],
+        "diff3": ["--version"],
         "dir": ["--version"],
         "dircolors": ["--version"],
         "dirname": ["--version"],
@@ -95,6 +99,7 @@ alias(
         "numfmt": ["--version"],
         "od": ["--version"],
         "paste": ["--version"],
+        "patch": ["--version"],
         "pathchk": ["--version"],
         "pigz": ["--version"],
         "pinky": ["--version"],
@@ -113,6 +118,7 @@ alias(
         "rsync": ["--version"],
         "runcon": ["--version"],
         # "script": ["--version"],
+        "sdiff": ["--version"],
         "sed": ["--version"],
         "seq": ["--version"],
         "sha1sum": ["--version"],

e2e/toolchain/curl/BUILD.bazel

@@ -18,6 +18,7 @@ alias(
 
 toolchain_test(
     name = "test",
+    size = "small",
     args = ["--version"],
     toolchains = [":resolved"],
 )