From 7ecb2a1144bb3b25129d527296adb5481a8aaa0a Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 28 Dec 2021 13:38:03 +0300 Subject: refactor(tools/depotfmt): Move depotfmt check into a real build step Produces more useful output and also makes for a good target for the upcoming extraSteps logic. Change-Id: Ifd389d433d9e27f97940a48999f4fba35646e37a Reviewed-on: https://cl.tvl.fyi/c/depot/+/4727 Tested-by: BuildkiteCI Autosubmit: tazjin Reviewed-by: sterni --- tools/depotfmt.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tools') diff --git a/tools/depotfmt.nix b/tools/depotfmt.nix index c3c9852430..312ef3f8df 100644 --- a/tools/depotfmt.nix +++ b/tools/depotfmt.nix @@ -27,13 +27,13 @@ let --tree-root $(${pkgs.git}/bin/git rev-parse --show-toplevel) ''; - # wrapper for running formatting checks in CI - check = pkgs.runCommandNoCC "depotfmt-check" {} '' - ${pkgs.git}/bin/git clone ${depot.path.origSrc} depot - export HOME="$(${pkgs.coreutils}/bin/realpath .)" + # wrapper script for running formatting checks in CI + check = pkgs.writeShellScript "depotfmt-check" '' ${pkgs.treefmt}/bin/treefmt \ --fail-on-change \ --config-file ${config} \ - --tree-root depot && : > $out + --tree-root . ''; -in depotfmt // depot.nix.readTree.drvTargets { inherit check; } +in depotfmt.overrideAttrs(_: { + passthru.check = check; +}) -- cgit 1.4.1