Skip to content

Commit

Permalink
Formatter tests shouldn't always succeed!
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelpj committed Jun 30, 2020
1 parent 9946c5f commit ada344a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion ci.nix
Expand Up @@ -22,7 +22,7 @@ in dimension "System" (systems genericPkgs) (systemName: system:
lib = pkgs.lib;
platformFilter = platformFilterGeneric pkgs system;
in filterAttrsOnlyRecursive (_: v: platformFilter v) {
inherit (packageSet) docs papers dev plutus-playground marlowe-playground plutus-scb marlowe-symbolic-lambda;
inherit (packageSet) docs papers dev tests plutus-playground marlowe-playground plutus-scb marlowe-symbolic-lambda;
haskell =
let
# These functions pull out from the Haskell package set either all the components of a particular type, or
Expand Down
9 changes: 4 additions & 5 deletions nix/tests/purty.nix
Expand Up @@ -7,16 +7,15 @@ let
filter = with lib;
name: type: let baseName = baseNameOf (toString name); in (
(type == "regular" && hasSuffix ".purs" baseName) ||
(type == "directory" && (baseName != "generated"
&& baseName != "output"
&& baseName != "node_modules"
&& baseName != ".psc-package"
(type == "directory" && (baseName != "generated"
&& baseName != "output"
&& baseName != "node_modules"
&& baseName != ".psc-package"
&& baseName != ".spago"))
);
};
in
runCommand "purty-check" {
succeedOnFailure = true;
buildInputs = [ purty diffutils glibcLocales ];
} ''
set +e
Expand Down
1 change: 0 additions & 1 deletion nix/tests/stylish-haskell.nix
Expand Up @@ -13,7 +13,6 @@ let
};
in
runCommand "stylish-check" {
succeedOnFailure = true;
buildInputs = [ stylish-haskell diffutils glibcLocales ];
} ''
set +e
Expand Down
2 changes: 1 addition & 1 deletion plutus-scb/src/Cardano/Node/Types.hs
Expand Up @@ -17,8 +17,8 @@ import GHC.Generics (Generic)
import qualified Language.Plutus.Contract.Trace as Trace
import Servant (FromHttpApiData, ToHttpApiData)
import Servant.Client (BaseUrl)
import Wallet.Emulator (Wallet)
import qualified Wallet.Emulator as EM
import Wallet.Emulator (Wallet)
import Wallet.Emulator.Chain (ChainEvent, ChainState)
import qualified Wallet.Emulator.MultiAgent as MultiAgent

Expand Down

0 comments on commit ada344a

Please sign in to comment.