From 3895dfe2cfb013a1bbe5896e4541f29ed81445dc Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 15 Jan 2025 06:51:53 +0100 Subject: [PATCH 1/2] ci: Show example nixfmt command prominently --- .github/workflows/check-nix-format.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index a70e132dc459a..b99893556ea59 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -91,7 +91,9 @@ jobs: if (( "${#unformattedFiles[@]}" > 0 )); then echo "Some new/changed Nix files are not properly formatted" echo "Please format them using the Nixpkgs-specific \`nixfmt\` by going to the Nixpkgs root directory, running \`nix-shell\`, then:" + echo echo "nixfmt ${unformattedFiles[*]@Q}" + echo echo "Make sure your branch is up to date with master, rebase if not." echo "If you're having trouble, please ping @NixOS/nix-formatting" exit 1 From c98e26ae4e646a2caec920ffbd362839918b5a16 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 15 Jan 2025 06:52:30 +0100 Subject: [PATCH 2/2] ci: Interpunction The latter part is structurally a full sentence, if short. --- .github/workflows/check-nix-format.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index b99893556ea59..96727ee994e62 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -94,7 +94,7 @@ jobs: echo echo "nixfmt ${unformattedFiles[*]@Q}" echo - echo "Make sure your branch is up to date with master, rebase if not." + echo "Make sure your branch is up to date with master; rebase if not." echo "If you're having trouble, please ping @NixOS/nix-formatting" exit 1 fi