mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/crate2nix-check): Revert use of depotfmt.check wrapper

Browse source 
This is a partial revert of https://cl.tvl.fyi/c/depot/+/12068 where I
changed tvix/crate2nix-check to use depotfmt.check. It turns out that we
don't actually want to be using it in this case as the wrapper sets
`--fail-on-change` which would always fail because the Cargo.nix
generated by crate2nix will always need to be changed (It's not
formatted properly).

Change-Id: Ife35c812ca69c90459ce4445f4252d0a24c218fa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12132
Tested-by: BuildkiteCI
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
Ilan Joselevich 2024-08-04 03:22:44 +03:00 committed by clbot
parent 9c01ab3e84
commit 26129c1761
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tvix/default.nix
View file

@ -73,8 +73,11 @@ in
cargo metadata > /dev/null cargo metadata > /dev/null
${pkgs.crate2nix}/bin/crate2nix generate --all-features ${pkgs.crate2nix}/bin/crate2nix generate --all-features
# Reuse depotfmt wrapper that can be used inside a sandbox. ${pkgs.treefmt}/bin/treefmt Cargo.nix \
${depot.tools.depotfmt.check} Cargo.nix --no-cache \
--on-unmatched=debug \
--config-file=${depot.tools.depotfmt.config} \
--tree-root=.
# technically unnecessary, but provides more-helpful output in case of error # technically unnecessary, but provides more-helpful output in case of error
diff -ur Cargo.nix ${src}/Cargo.nix diff -ur Cargo.nix ${src}/Cargo.nix