Compare revisions

Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson · Matthew Clarkson
--- a/.bazelrc
+++ b/.bazelrc
 # `bzlmod` pre-release registries
 common --registry https://bcr.bazel.build
-common --registry=https://gitlab.arm.com/bazel/rules_toolchain/-/releases/v1.0.0-alpha.16/downloads
-common --registry=https://gitlab.arm.com/bazel/rules_download/-/releases/v1.0.0-alpha.5/downloads
+common --registry=https://gitlab.arm.com/bazel/rules_download/-/releases/v1.0.0-alpha.8/downloads

 # Build cache
 build --experimental_guard_against_concurrent_changes
@@ -15,5 +14,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
--- a/.bazelrc.ci
+++ b/.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


--- a/CHANGELOG.md
+++ b/CHANGELOG.md
+# [1.0.0-alpha.6](https://git.gitlab.arm.com/bazel/rules_coreutils/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2024-02-12)
+
+### Bug Fixes
+
+- switch to `toolchain_utils@1.0.0-beta.1` ([87d239d](https://git.gitlab.arm.com/bazel/rules_coreutils/commit/87d239da3f7c97f5734c5310360b814da3ff1ade))
+- upgrade to `rules_download@1.0.0-alpha.8` ([d0f23f5](https://git.gitlab.arm.com/bazel/rules_coreutils/commit/d0f23f577dc570df6fcc2a43786b933e31b87bb4))
+
+### Features
+
+- add `chmod` toolchain ([cefa208](https://git.gitlab.arm.com/bazel/rules_coreutils/commit/cefa20839d1b321cdebf40d6a9f2c2e42caaf56f))
+- add `chown` toolchain ([025b7b0](https://git.gitlab.arm.com/bazel/rules_coreutils/commit/025b7b02a69aa875f99ab1388a2bf09e57542db0))
+- add `install` toolchain ([44aaf47](https://git.gitlab.arm.com/bazel/rules_coreutils/commit/44aaf472aca82e0a0d01adbbce165f3973a6ecc2))
+
 # [1.0.0-alpha.5](https://git.gitlab.arm.com/bazel/rules_coreutils/compare/v1.0.0-alpha.4...v1.0.0-alpha.5) (2024-01-12)

 ### Bug Fixes

--- a/CODEOWNERS
+++ b/CODEOWNERS
+* @bazel
+
+[Documentation] @matthew.clarkson
+*.md
+
+[Licensing] @matthew.clarkson
+/.reuse/dep5
+/LICENSES/*
+
+[Configuration] @matthew.clarkson
+.editorconfig
+
+[CI] @matthew.clarkson
+.gitlab-ci.yml
+
+[Release] @matthew.clarkson
+/.releaserc.yaml
+
+[Node] @matthew.clarkson
+/package.json
+/.npmrc
+
+[Branding] @matthew.clarkson
+/icon.svg
+
+[Bazel] @matthew.clarkson
+/.bazelrc
+/.bazelrc.ci
+/.bazelignore
+/.bazelversion
+*.bazel
+*.bzl
+WORKSPACE
--- a/MODULE.bazel
+++ b/MODULE.bazel
 module(
    name = "rules_coreutils",
-    version = "1.0.0-alpha.5",
+    version = "1.0.0-alpha.6",
    bazel_compatibility = [
        ">=7.0.0",
    ],
    compatibility_level = 1,
 )

-bazel_dep(name = "rules_toolchain", version = "1.0.0-alpha.16")
-bazel_dep(name = "rules_download", version = "1.0.0-alpha.5")
+bazel_dep(name = "toolchain_utils", version = "1.0.0-beta.1")
+bazel_dep(name = "rules_download", version = "1.0.0-alpha.8")

 archive = use_repo_rule("@rules_download//download/archive:defs.bzl", "download_archive")

@@ -16,10 +16,10 @@ archive(
    name = "coreutils-arm64-linux-gnu",
    srcs = ["entrypoint"],
    integrity = "sha256-8wMVMgAgf8JQ2+2LdoewkyDo416VEsf9RlMJl4jiBjk=",
-    strip_prefix = "coreutils-0.0.23-aarch64-unknown-linux-gnu",
-    symlinks = {
+    links = {
        "coreutils": "entrypoint",
    },
+    strip_prefix = "coreutils-0.0.23-aarch64-unknown-linux-gnu",
    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.23/coreutils-0.0.23-aarch64-unknown-linux-gnu.tar.gz"],
 )

@@ -27,10 +27,10 @@ archive(
    name = "coreutils-amd64-linux-gnu",
    srcs = ["entrypoint"],
    integrity = "sha256-u7OMW43Y46aXRRIKULfKdfUW51WJn6G70s5Xxwb6/1g=",
-    strip_prefix = "coreutils-0.0.23-x86_64-unknown-linux-gnu",
-    symlinks = {
+    links = {
        "coreutils": "entrypoint",
    },
+    strip_prefix = "coreutils-0.0.23-x86_64-unknown-linux-gnu",
    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.23/coreutils-0.0.23-x86_64-unknown-linux-gnu.tar.gz"],
 )

@@ -38,10 +38,10 @@ archive(
    name = "coreutils-amd64-windows-msvc",
    srcs = ["entrypoint"],
    integrity = "sha256-aglIj5JvFGLm2ABwRzWAsZRTTD3X444V3GxHM9pGJS4=",
-    strip_prefix = "coreutils-0.0.23-x86_64-pc-windows-msvc",
-    symlinks = {
+    links = {
        "coreutils.exe": "entrypoint",
    },
+    strip_prefix = "coreutils-0.0.23-x86_64-pc-windows-msvc",
    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.23/coreutils-0.0.23-x86_64-pc-windows-msvc.zip"],
 )

@@ -49,14 +49,14 @@ archive(
    name = "coreutils-arm64-macos-darwin",
    srcs = ["entrypoint"],
    integrity = "sha256-KP90sjKxtXDbLC+o5f4+gQnvP3Tr7O0RopME4g9QF5E=",
-    strip_prefix = "coreutils-0.0.23-aarch64-apple-darwin",
-    symlinks = {
+    links = {
        "coreutils": "entrypoint",
    },
+    strip_prefix = "coreutils-0.0.23-aarch64-apple-darwin",
    urls = ["https://github.com/uutils/coreutils/releases/download/0.0.23/coreutils-0.0.23-aarch64-apple-darwin.tar.gz"],
 )

-select = use_repo_rule("@rules_toolchain//toolchain/local/select:defs.bzl", "toolchain_local_select")
+select = use_repo_rule("@toolchain_utils//toolchain/local/select:defs.bzl", "toolchain_local_select")

 select(
    name = "coreutils",
@@ -68,7 +68,7 @@ select(
    },
 )

-export = use_extension("@rules_toolchain//toolchain/export:defs.bzl", "toolchain_export")
+export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
 export.symlink(
    name = "coreutils",
    target = "@coreutils",
@@ -92,9 +92,9 @@ deb(
    urls = ["http://ftp.uk.debian.org/debian/pool/main/b/busybox/busybox-static_1.35.0-4+b3_amd64.deb"],
 )

-resolved = use_repo_rule("@rules_toolchain//toolchain/resolved:defs.bzl", "toolchain_resolved")
+resolved = use_repo_rule("@toolchain_utils//toolchain/resolved:defs.bzl", "toolchain_resolved")

-which = use_repo_rule("@rules_toolchain//toolchain/local/which:defs.bzl", "toolchain_local_which")
+which = use_repo_rule("@toolchain_utils//toolchain/local/which:defs.bzl", "toolchain_local_which")

 [
    (
@@ -115,6 +115,8 @@ which = use_repo_rule("@rules_toolchain//toolchain/local/which:defs.bzl", "toolc
        "base64",
        "basename",
        "cat",
+        "chmod",
+        "chown",
        "cp",
        "cut",
        "date",
@@ -131,6 +133,7 @@ which = use_repo_rule("@rules_toolchain//toolchain/local/which:defs.bzl", "toolc
        "fold",
        "head",
        "hostname",
+        "install",
        "link",
        "ln",
        "ls",

--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ The `coreutils` multi-call binary is exported for use in hermetic repository rul
 Use the repository from the export extension in `MODULE.bazel`:

 ```py
-export = use_extension("@rules_toolchain//toolchain/export:defs.bzl", "toolchain_export")
+export = use_extension("@toolchain_utils//toolchain/export:defs.bzl", "toolchain_export")
 use_repo(export, "coreutils")

 some_repo_rule(

--- a/coreutils/toolchain/arch/BUILD.bazel
+++ b/coreutils/toolchain/arch/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
 load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")

@@ -33,7 +33,7 @@ toolchain_test(
    name = "test",
    size = "small",
    args = ["--help"],
-    stderr = "@rules_toolchain//toolchain/test:any",
-    stdout = "@rules_toolchain//toolchain/test:any",
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
    toolchains = [":resolved"],
 )
--- a/coreutils/toolchain/base64/BUILD.bazel
+++ b/coreutils/toolchain/base64/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
 load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")

@@ -33,7 +33,7 @@ toolchain_test(
    name = "test",
    size = "small",
    args = ["--help"],
-    stderr = "@rules_toolchain//toolchain/test:any",
-    stdout = "@rules_toolchain//toolchain/test:any",
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
    toolchains = [":resolved"],
 )
--- a/coreutils/toolchain/basename/BUILD.bazel
+++ b/coreutils/toolchain/basename/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
 load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")

@@ -33,7 +33,7 @@ toolchain_test(
    name = "test",
    size = "small",
    args = ["--help"],
-    stderr = "@rules_toolchain//toolchain/test:any",
-    stdout = "@rules_toolchain//toolchain/test:any",
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
    toolchains = [":resolved"],
 )
--- a/coreutils/toolchain/busybox/BUILD.bazel
+++ b/coreutils/toolchain/busybox/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load(":toolchains.bzl", "toolchains")

 toolchain_type(
@@ -28,7 +28,7 @@ toolchain_test(
    size = "small",
    args = ["--help"],
    target_compatible_with = [
-        "@rules_toolchain//toolchain/constraint/os:linux",
+        "@toolchain_utils//toolchain/constraint/os:linux",
    ],
    toolchains = [":resolved"],
 )
--- a/coreutils/toolchain/busybox/toolchains.bzl
+++ b/coreutils/toolchain/busybox/toolchains.bzl
-load("@rules_toolchain//toolchain/symlink/target:defs.bzl", "toolchain_symlink_target")
+load("@toolchain_utils//toolchain/symlink/target:defs.bzl", "toolchain_symlink_target")

 visibility("//coreutils/...")

@@ -23,8 +23,8 @@ def toolchains(*, basename, toolchain_type, variable = None):
    native.toolchain(
        name = "busybox-amd64-linux",
        exec_compatible_with = [
-            "@rules_toolchain//toolchain/constraint/cpu:amd64",
-            "@rules_toolchain//toolchain/constraint/os:linux",
+            "@toolchain_utils//toolchain/constraint/cpu:amd64",
+            "@toolchain_utils//toolchain/constraint/os:linux",
        ],
        toolchain = ":busybox-amd64-linux-tool",
        toolchain_type = toolchain_type,
@@ -33,8 +33,8 @@ def toolchains(*, basename, toolchain_type, variable = None):
    native.toolchain(
        name = "busybox-arm64-linux",
        exec_compatible_with = [
-            "@rules_toolchain//toolchain/constraint/cpu:arm64",
-            "@rules_toolchain//toolchain/constraint/os:linux",
+            "@toolchain_utils//toolchain/constraint/cpu:arm64",
+            "@toolchain_utils//toolchain/constraint/os:linux",
        ],
        toolchain = ":busybox-arm64-linux-tool",
        toolchain_type = toolchain_type,

--- a/coreutils/toolchain/cat/BUILD.bazel
+++ b/coreutils/toolchain/cat/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
 load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")

@@ -33,7 +33,7 @@ toolchain_test(
    name = "test",
    size = "small",
    args = ["--help"],
-    stderr = "@rules_toolchain//toolchain/test:any",
-    stdout = "@rules_toolchain//toolchain/test:any",
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
    toolchains = [":resolved"],
 )
--- a/coreutils/toolchain/chmod/BUILD.bazel
+++ b/coreutils/toolchain/chmod/BUILD.bazel
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
+load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
+load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")
+
+toolchain_type(
+    name = "type",
+    visibility = ["//visibility:public"],
+)
+
+toolchain(
+    name = "local",
+    toolchain = "@which-chmod",
+    toolchain_type = ":type",
+)
+
+coreutils(
+    basename = "chmod",
+    toolchain_type = ":type",
+)
+
+busybox(
+    basename = "chmod",
+    toolchain_type = ":type",
+)
+
+alias(
+    name = "resolved",
+    actual = "@resolved-chmod",
+    visibility = ["//visibility:public"],
+)
+
+toolchain_test(
+    name = "test",
+    size = "small",
+    args = ["--help"],
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
+    toolchains = [":resolved"],
+)
--- a/coreutils/toolchain/chown/BUILD.bazel
+++ b/coreutils/toolchain/chown/BUILD.bazel
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
+load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
+load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")
+
+toolchain_type(
+    name = "type",
+    visibility = ["//visibility:public"],
+)
+
+toolchain(
+    name = "local",
+    toolchain = "@which-chown",
+    toolchain_type = ":type",
+)
+
+coreutils(
+    basename = "chown",
+    toolchain_type = ":type",
+)
+
+busybox(
+    basename = "chown",
+    toolchain_type = ":type",
+)
+
+alias(
+    name = "resolved",
+    actual = "@resolved-chown",
+    visibility = ["//visibility:public"],
+)
+
+toolchain_test(
+    name = "test",
+    size = "small",
+    args = ["--help"],
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
+    toolchains = [":resolved"],
+)
--- a/coreutils/toolchain/coreutils/BUILD.bazel
+++ b/coreutils/toolchain/coreutils/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load(":toolchains.bzl", "toolchains")

 toolchain_type(

--- a/coreutils/toolchain/coreutils/toolchains.bzl
+++ b/coreutils/toolchain/coreutils/toolchains.bzl
-load("@rules_toolchain//toolchain/symlink/target:defs.bzl", "toolchain_symlink_target")
+load("@toolchain_utils//toolchain/symlink/target:defs.bzl", "toolchain_symlink_target")

 visibility("//coreutils/...")

@@ -37,8 +37,8 @@ def toolchains(*, basename, toolchain_type, variable = None):
    native.toolchain(
        name = "coreutils-amd64-linux",
        exec_compatible_with = [
-            "@rules_toolchain//toolchain/constraint/cpu:amd64",
-            "@rules_toolchain//toolchain/constraint/os:linux",
+            "@toolchain_utils//toolchain/constraint/cpu:amd64",
+            "@toolchain_utils//toolchain/constraint/os:linux",
        ],
        toolchain = ":coreutils-amd64-linux-gnu-tool",
        toolchain_type = toolchain_type,
@@ -47,8 +47,8 @@ def toolchains(*, basename, toolchain_type, variable = None):
    native.toolchain(
        name = "coreutils-arm64-linux",
        exec_compatible_with = [
-            "@rules_toolchain//toolchain/constraint/cpu:arm64",
-            "@rules_toolchain//toolchain/constraint/os:linux",
+            "@toolchain_utils//toolchain/constraint/cpu:arm64",
+            "@toolchain_utils//toolchain/constraint/os:linux",
        ],
        toolchain = ":coreutils-arm64-linux-gnu-tool",
        toolchain_type = toolchain_type,
@@ -57,8 +57,8 @@ def toolchains(*, basename, toolchain_type, variable = None):
    native.toolchain(
        name = "coreutils-amd64-windows",
        exec_compatible_with = [
-            "@rules_toolchain//toolchain/constraint/cpu:amd64",
-            "@rules_toolchain//toolchain/constraint/os:windows",
+            "@toolchain_utils//toolchain/constraint/cpu:amd64",
+            "@toolchain_utils//toolchain/constraint/os:windows",
        ],
        toolchain = ":coreutils-amd64-windows-msvc-tool",
        toolchain_type = toolchain_type,
@@ -67,8 +67,8 @@ def toolchains(*, basename, toolchain_type, variable = None):
    native.toolchain(
        name = "coreutils-arm64-macos",
        exec_compatible_with = [
-            "@rules_toolchain//toolchain/constraint/cpu:arm64",
-            "@rules_toolchain//toolchain/constraint/os:macos",
+            "@toolchain_utils//toolchain/constraint/cpu:arm64",
+            "@toolchain_utils//toolchain/constraint/os:macos",
        ],
        toolchain = ":coreutils-arm64-macos-darwin-tool",
        toolchain_type = toolchain_type,

--- a/coreutils/toolchain/cp/BUILD.bazel
+++ b/coreutils/toolchain/cp/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
 load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")

@@ -33,7 +33,7 @@ toolchain_test(
    name = "test",
    size = "small",
    args = ["--help"],
-    stderr = "@rules_toolchain//toolchain/test:any",
-    stdout = "@rules_toolchain//toolchain/test:any",
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
    toolchains = [":resolved"],
 )
--- a/coreutils/toolchain/cut/BUILD.bazel
+++ b/coreutils/toolchain/cut/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
 load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")

@@ -33,7 +33,7 @@ toolchain_test(
    name = "test",
    size = "small",
    args = ["--help"],
-    stderr = "@rules_toolchain//toolchain/test:any",
-    stdout = "@rules_toolchain//toolchain/test:any",
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
    toolchains = [":resolved"],
 )
--- a/coreutils/toolchain/date/BUILD.bazel
+++ b/coreutils/toolchain/date/BUILD.bazel
-load("@rules_toolchain//toolchain/test:defs.bzl", "toolchain_test")
+load("@toolchain_utils//toolchain/test:defs.bzl", "toolchain_test")
 load("//coreutils/toolchain/busybox:toolchains.bzl", busybox = "toolchains")
 load("//coreutils/toolchain/coreutils:toolchains.bzl", coreutils = "toolchains")

@@ -33,7 +33,7 @@ toolchain_test(
    name = "test",
    size = "small",
    args = ["--help"],
-    stderr = "@rules_toolchain//toolchain/test:any",
-    stdout = "@rules_toolchain//toolchain/test:any",
+    stderr = "@toolchain_utils//toolchain/test:any",
+    stdout = "@toolchain_utils//toolchain/test:any",
    toolchains = [":resolved"],
 )
No results found