diff options
| -rw-r--r-- | ops/pipelines/depot.nix | 9 | ||||
| -rw-r--r-- | tools/depotfmt.nix | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/ops/pipelines/depot.nix b/ops/pipelines/depot.nix index 232d229b90..036ddada0e 100644 --- a/ops/pipelines/depot.nix +++ b/ops/pipelines/depot.nix @@ -11,17 +11,10 @@ let label = ":water_buffalo:"; }; - # Formatting check which validates that all supported auto-formatted - # files are formatted correctly. See //tools/depotfmt for details. - depotfmtCheck = { - command = "${depot.tools.depotfmt.check}"; - label = ":evergreen_tree: (tools/depotfmt)"; - }; - pipeline = depot.nix.buildkite.mkPipeline { headBranch = "refs/heads/canon"; drvTargets = depot.ci.targets; - additionalSteps = [ depotfmtCheck protoCheck ]; + additionalSteps = [ protoCheck ]; parentTargetMap = if (externalArgs ? parentTargetMap) then builtins.fromJSON (builtins.readFile externalArgs.parentTargetMap) diff --git a/tools/depotfmt.nix b/tools/depotfmt.nix index 312ef3f8df..8c8e99c089 100644 --- a/tools/depotfmt.nix +++ b/tools/depotfmt.nix @@ -35,5 +35,9 @@ let --tree-root . ''; in depotfmt.overrideAttrs(_: { - passthru.check = check; + passthru.meta.ci.extraSteps.check = { + label = "depot formatting check"; + command = check; + alwaysRun = true; + }; }) |