lighter stylish-haskell job in CI

Signed-off-by: Alexander Diemand <codieplusplus@apax.net>
input-output-hk · Aug 10, 2020 · 922b87e · 922b87e
1 parent 7a72b76
commit 922b87e
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 62 deletions.
diff --git a/.buildkite/check-stylish.sh b/.buildkite/check-stylish.sh
@@ -12,7 +12,7 @@ echo
 echo "Running Stylish Haskell"
 echo "======================="
 echo
-stylish-haskell -c .stylish-haskell.yaml -i $(git ls-files -- '*.hs')
+stylish-haskell -c .stylish-haskell.yaml -i $(git ls-files -- '*.hs' | grep 'bm-timeline')
 
 echo
 echo

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -21,7 +21,7 @@ steps:
   #     system: x86_64-linux
 
   - label: 'Check Stylish Haskell'
-    command: 'nix-shell --run ./.buildkite/check-stylish.sh'
+    command: 'nix-shell --pure --run ./.buildkite/check-stylish.sh nix/stack-shell.nix'
     agents:
       system: x86_64-linux
 
diff --git a/.stylish-haskell.yaml b/.stylish-haskell.yaml
@@ -276,9 +276,34 @@ newline: native
 # needs to be aware of these, so it can parse the file correctly.
 #
 # No language extensions are enabled by default.
-# language_extensions:
-  # - TemplateHaskell
-  # - QuasiQuotes
+language_extensions:
+  - BangPatterns
+  - ConstraintKinds
+  - DataKinds
+  - DefaultSignatures
+  - DeriveDataTypeable
+  - DeriveGeneric
+  - ExistentialQuantification
+  - FlexibleContexts
+  - FlexibleInstances
+  - FunctionalDependencies
+  - GADTs
+  - GeneralizedNewtypeDeriving
+  - LambdaCase
+  - MultiParamTypeClasses
+  - MultiWayIf
+  - NoImplicitPrelude
+  - OverloadedStrings
+  - PolyKinds
+  - RecordWildCards
+  - ScopedTypeVariables
+  - StandaloneDeriving
+  - TemplateHaskell
+  - TupleSections
+  - TypeApplications
+  - TypeFamilies
+  - ViewPatterns
+  - ExplicitNamespaces
 
 # Attempt to find the cabal file in ancestors of the current directory, and
 # parse options (currently only language extensions) from that.

diff --git a/bm-timeline/src/Cardano/BM/AddToChain.hs b/bm-timeline/src/Cardano/BM/AddToChain.hs
@@ -9,14 +9,13 @@ import           Data.Text.Lazy (Text, unpack)
 
 import           Cardano.BM.Common
 
-data AddToChain
-  = AddToChain
-      { node      :: NodeId
-      , slot      :: SlotNum
-      , timestamp :: Timestamp
-      , msg       :: Text
-      }
-  deriving (Show)
+data AddToChain = AddToChain
+    { node      :: NodeId
+    , slot      :: SlotNum
+    , timestamp :: Timestamp
+    , msg       :: Text
+    }
+    deriving (Show)
 
 instance Lineparser AddToChain where
     -- example:

diff --git a/bm-timeline/src/Cardano/BM/Adopted.hs b/bm-timeline/src/Cardano/BM/Adopted.hs
@@ -9,17 +9,16 @@ import           Data.Text.Lazy (Text, unpack)
 
 import           Cardano.BM.Common
 
-data Adopted
-  = Adopted
-      { node      :: NodeId
-      , slot      :: SlotNum
-      , timestamp :: Timestamp
-      , msg       :: Text
-      , blockhash :: Text
-      , ntx       :: Int
-      , bsz       :: Int
-      }
-  deriving (Show)
+data Adopted = Adopted
+    { node      :: NodeId
+    , slot      :: SlotNum
+    , timestamp :: Timestamp
+    , msg       :: Text
+    , blockhash :: Text
+    , ntx       :: Int
+    , bsz       :: Int
+    }
+    deriving (Show)
 
 instance Lineparser Adopted where
     -- example:

diff --git a/bm-timeline/src/Cardano/BM/CPUticks.hs b/bm-timeline/src/Cardano/BM/CPUticks.hs
@@ -9,13 +9,12 @@ import           Data.Text.Lazy (unpack)
 
 import           Cardano.BM.Common
 
-data CPUticks
-  = CPUticks
-      { timestamp :: Timestamp
-      , ticks     :: Int
-      , node      :: NodeId
-      }
-  deriving (Show)
+data CPUticks = CPUticks
+    { timestamp :: Timestamp
+    , ticks     :: Int
+    , node      :: NodeId
+    }
+    deriving (Show)
 
 instance Lineparser CPUticks where
     -- example:

diff --git a/bm-timeline/src/Cardano/BM/Leader.hs b/bm-timeline/src/Cardano/BM/Leader.hs
@@ -9,14 +9,13 @@ import           Data.Text.Lazy (Text, unpack)
 
 import           Cardano.BM.Common
 
-data Leader
-  = Leader
-      { node      :: NodeId
-      , slot      :: SlotNum
-      , timestamp :: Timestamp
-      , msg       :: Text
-      }
-  deriving (Show)
+data Leader = Leader
+    { node      :: NodeId
+    , slot      :: SlotNum
+    , timestamp :: Timestamp
+    , msg       :: Text
+    }
+    deriving (Show)
 
 instance Lineparser Leader where
     -- example:

diff --git a/bm-timeline/src/Cardano/BM/MemResident.hs b/bm-timeline/src/Cardano/BM/MemResident.hs
@@ -9,13 +9,12 @@ import           Data.Text.Lazy (unpack)
 
 import           Cardano.BM.Common
 
-data MemResident
-  = MemResident
-      { timestamp   :: Timestamp
-      , memresident :: Int
-      , node        :: NodeId
-      }
-  deriving (Show)
+data MemResident = MemResident
+    { timestamp   :: Timestamp
+    , memresident :: Int
+    , node        :: NodeId
+    }
+    deriving (Show)
 
 instance Lineparser MemResident where
     -- example:

diff --git a/bm-timeline/src/Cardano/BM/TxAdopted.hs b/bm-timeline/src/Cardano/BM/TxAdopted.hs
@@ -9,14 +9,13 @@ import           Data.Text.Lazy (Text, unpack)
 
 import           Cardano.BM.Common
 
-data TxAdopted
-  = TxAdopted
-      { txid      :: Text
-      , timestamp :: Timestamp
-      , node      :: NodeId
-      , slot      :: SlotNum
-      }
-  deriving (Show)
+data TxAdopted = TxAdopted
+    { txid      :: Text
+    , timestamp :: Timestamp
+    , node      :: NodeId
+    , slot      :: SlotNum
+    }
+    deriving (Show)
 
 instance Lineparser TxAdopted where
     -- example:

diff --git a/bm-timeline/src/Cardano/BM/TxMempool.hs b/bm-timeline/src/Cardano/BM/TxMempool.hs
@@ -9,13 +9,12 @@ import           Data.Text.Lazy (Text, unpack)
 
 import           Cardano.BM.Common
 
-data TxMempool
-  = TxMempool
-      { txid      :: Text
-      , timestamp :: Timestamp
-      , node      :: NodeId
-      }
-  deriving (Show)
+data TxMempool = TxMempool
+    { txid      :: Text
+    , timestamp :: Timestamp
+    , node      :: NodeId
+    }
+    deriving (Show)
 
 instance Lineparser TxMempool where
     -- example:

diff --git a/nix/stack-shell.nix b/nix/stack-shell.nix
@@ -4,6 +4,6 @@ with import ./. {};
 haskell.lib.buildStackProject {
   name = "stack-env";
   exactDeps = false;
-  buildInputs = with pkgs; [ cabal-install stack zlib openssl gmp libffi git systemd haskellPackages.happy ];
+  buildInputs = with pkgs; [ cabal-install stack zlib openssl gmp libffi git systemd haskellPackages.happy stylish-haskell ];
   ghc = (import ../shell.nix {inherit pkgs;}).ghc;
 }