Skip to content

Commit

Permalink
SRE-203: Add check-stylish-network to Hydra
Browse files Browse the repository at this point in the history
  • Loading branch information
craigem committed Jan 18, 2022
1 parent 578ea44 commit 1e67d5e
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 8 deletions.
1 change: 1 addition & 0 deletions default.nix
Expand Up @@ -46,6 +46,7 @@ let
styles = recurseIntoAttrs {
check-nixfmt = callPackage ./nix/check-nixfmt.nix { };
check-stylish = callPackage ./nix/check-stylish.nix { };
check-stylish-network = callPackage ./nix/check-stylish-network.nix { };
};
};

Expand Down
18 changes: 18 additions & 0 deletions nix/check-stylish-network.nix
@@ -0,0 +1,18 @@
{ runCommand, fd, lib, stylish-haskell }:

runCommand "check-stylish-network" {
meta.platforms = with lib.platforms; [ linux ];
buildInputs = [ fd stylish-haskell ];
src = ./..;
} ''
unpackPhase
cd $sourceRoot
fd -p io-sim -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p io-classes -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p strict-stm -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p typed-protocols -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p network-mux -e hs -E Setup.hs -E network-mux/src/Network/Mux/Bearer/Pipe.hs -E network-mux/src/Network/Mux/Channel.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p ouroboros-network* -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p cardano-client -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
echo $? >> $out
''
2 changes: 1 addition & 1 deletion release.nix
Expand Up @@ -110,7 +110,7 @@ let
])) ++ (testsPaths [ "ouroboros-network" "cddl" ])
++ (checksPaths [ "ouroboros-network" "cddl" ])
++ (exesPaths [ "network-mux" "cardano-ping" ])
++ (stylePaths [ "check-nixfmt" "check-stylish" ])
++ (stylePaths [ "check-nixfmt" "check-stylish" "check-stylish-network" ])
++ onlyBuildOnDefaultSystem;

# Remove build jobs for which cross compiling does not make sense.
Expand Down
14 changes: 7 additions & 7 deletions scripts/ci/check-stylish-network.sh
Expand Up @@ -2,13 +2,13 @@

set -euo pipefail

stylish-haskell -c .stylish-haskell-network.yaml -i $(git ls-files -- 'io-sim/*.hs' | grep -v -e 'Setup.hs')
stylish-haskell -c .stylish-haskell-network.yaml -i $(git ls-files -- 'io-classes/*.hs' | grep -v -e 'Setup.hs')
stylish-haskell -c .stylish-haskell-network.yaml -i $(git ls-files -- 'strict-stm/*.hs' | grep -v -e 'Setup.hs')
stylish-haskell -c .stylish-haskell-network.yaml -i $(git ls-files -- 'typed-protocols*/*.hs' | grep -v -e 'Setup.hs')
fd -p io-sim -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p io-classes -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p strict-stm -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p typed-protocols -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
# TODO CPP pragmas in export lists are not supported by stylish-haskell
stylish-haskell -c .stylish-haskell-network.yaml -i $(git ls-files -- 'network-mux/*.hs' | grep -v -e 'Setup.hs' -e 'Network/Mux/Bearer/Pipe\.hs' -e 'Network/Mux/Channel\.hs')
stylish-haskell -c .stylish-haskell-network.yaml -i $(git ls-files -- 'ouroboros-network*/*.hs' | grep -v -e 'Setup.hs')
stylish-haskell -c .stylish-haskell-network.yaml -i $(git ls-files -- 'cardano-client/*.hs' | grep -v -e 'Setup.hs')
fd -p network-mux -e hs -E Setup.hs -E network-mux/src/Network/Mux/Bearer/Pipe.hs -E network-mux/src/Network/Mux/Channel.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p ouroboros-network* -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i
fd -p cardano-client -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell-network.yaml -i

git diff --exit-code

0 comments on commit 1e67d5e

Please sign in to comment.