Merge pull request #3189 from input-output-hk/devops-936-fix-stylish-script

[DEVOPS-936] Fix tests.stylishHaskell output when files are utf-8

Author: rvl

default.nix

@@ -157,11 +157,10 @@ let
     tests = {
       shellcheck = pkgs.callPackage ./scripts/test/shellcheck.nix { src = ./.; };
       hlint = pkgs.callPackage ./scripts/test/hlint.nix { src = ./.; };
-      stylishHaskell = pkgs.callPackage ./scripts/test/stylish.nix { src = ./.; stylish-haskell = cardanoPkgs.stylish-haskell; };
+      stylishHaskell = pkgs.callPackage ./scripts/test/stylish.nix { src = ./.; stylish-haskell = cardanoPkgs.stylish-haskell; inherit localLib; };
       buildWalletIntegration = pkgs.callPackage ./scripts/test/wallet/integration/build-test.nix { inherit walletIntegrationTests pkgs; };
       swaggerSchemaValidation = pkgs.callPackage ./scripts/test/wallet/swaggerSchemaValidation.nix { inherit gitrev; };
     };
-    fixStylishHaskell = pkgs.callPackage ./scripts/haskell/stylish.nix { stylish-haskell = cardanoPkgs.stylish-haskell; };
     cardano-sl-explorer-frontend = (import ./explorer/frontend {
       inherit system config gitrev pkgs;
       cardano-sl-explorer = cardanoPkgs.cardano-sl-explorer-static;

lib.nix

@@ -18,4 +18,13 @@ in lib // (rec {
   inherit fetchNixPkgs;
   isCardanoSL = lib.hasPrefix "cardano-sl";
   isBenchmark = args: !((args.isExecutable or false) || (args.isLibrary or true));
+
+  # Insert this into builder scripts where programs require a UTF-8
+  # locale to work.
+  utf8LocaleSetting = ''
+    export LC_ALL=en_GB.UTF-8
+    export LANG=en_GB.UTF-8
+  '' + lib.optionalString (pkgs.glibcLocales != null) ''
+    export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
+  '';
 })

scripts/launch/connect-to-cluster/default.nix

@@ -67,12 +67,6 @@ let
     "--configuration-file ${environments.${environment}.confFile or "${configFiles}/lib/configuration.yaml"}"
     "--configuration-key ${environments.${environment}.confKey}"
   ];
-  utf8LocaleSetting = ''
-    export LC_ALL=en_GB.UTF-8
-    export LANG=en_GB.UTF-8
-  '' + optionalString (pkgs.glibcLocales != null) ''
-    export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
-  '';
 
 in pkgs.writeScript "${executable}-connect-to-${environment}" ''
   #!${pkgs.stdenv.shell} -e

scripts/launch/demo-cluster/default.nix

@@ -109,7 +109,7 @@ in pkgs.writeScript "demo-cluster" ''
 
   done
   ${ifWallet ''
-    export LC_ALL=C.UTF-8
+    ${utf8LocaleSetting}
     echo Launching wallet node: ${demoWallet}
     ${demoWallet} --runtime-args "--system-start $system_start" &> /dev/null &
     wallet_pid=$!

scripts/test/stylish.nix

@@ -1,4 +1,4 @@
-{ runCommand, stylish-haskell, src, lib, git }:
+{ runCommand, stylish-haskell, src, lib, localLib, diffutils }:
 
 let
   cleanSourceFilter = with lib;
@@ -9,20 +9,24 @@ let
     );
   src' = builtins.filterSource cleanSourceFilter src;
 in
-runCommand "cardano-stylish-check" { succeedOnFailure = true; buildInputs = [ stylish-haskell git ]; } ''
+runCommand "cardano-stylish-check" {
+  succeedOnFailure = true;
+  buildInputs = [ stylish-haskell diffutils ];
+} ''
   set +e
-  cp -a ${src'} tmp-cardano
-  chmod -R 0755 tmp-cardano
-  cd tmp-cardano
-  git init
-  git add -A
+  ${localLib.utf8LocaleSetting}
+  cp -a ${src'} orig
+  cp -a ${src'} stylish
+  chmod -R +w stylish
+  cd stylish
   find . -type f -name "*hs" -not -path '.git' -not -path '*.stack-work*' -not -name 'HLint.hs' -exec stylish-haskell -i {} \;
-  git diff --exit-code
+  cd ..
+  diff --brief --recursive orig stylish > /dev/null
   EXIT_CODE=$?
   if [[ $EXIT_CODE != 0 ]]
   then
     mkdir -p $out/nix-support
-    git diff > $out/stylish.diff
+    diff -ur orig stylish > $out/stylish.diff
     echo "file none $out/stylish.diff" > $out/nix-support/hydra-build-products
     echo "*** Stylish-haskell found changes that need addressed first"
     echo "*** Please run \`nix-shell -A fixStylishHaskell\` and commit changes"