Merge pull request #664 from hexresearch/ci-8.6

Add GHC8.6 to CI

.drone.yml

@@ -22,6 +22,25 @@ steps:
   - cd nix
   - ./build-ci.sh --argstr ghc ghc883  --arg useSodium true  --arg isBench true
 
+- name: build-hschain-ghc865
+  image: nixos/nix:2.3.4
+  privileged: true
+  network_mode: host
+  environment:
+    DRONE_GITHUB_PULL_KEY:
+      from_secret: drone_github_pull_key
+    NIX_CACHE_KEY:
+      from_secret: nix_cache_key
+    NIX_CACHE_SIGNING_KEY:
+      from_secret: nix_cache_signing_key
+  commands:
+  - apk add --no-cache git bash openssh-client
+  - source ./nix/setup_ssh_ci.sh
+  - "echo -n \"$${NIX_CACHE_SIGNING_KEY}\" > \"$${HOME}/nix-cache-key.sec\""
+  - "chmod 400 \"$${HOME}/nix-cache-key.sec\""
+  - cd nix
+  - ./build-ci.sh --argstr ghc ghc865  --arg useSodium true  --arg isBench true
+
 - name: build-hschain-cryptonite
   image: nixos/nix:2.3.4
   privileged: true

cabal.project

@@ -16,7 +16,6 @@ packages:
          hschain-examples
          hschain-examples-types
          serialise-cddl
-         proof-of-work/full-mining
          proof-of-work/lightweight-check
 
 -- Jailbreak bytestring-arbitrary

hschain-PoW/HSChain/PoW/Tests.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP       #-}
 {-# LANGUAGE DataKinds #-}
 -- |
 -- Generic invariants for writing tests.
@@ -15,6 +16,9 @@ import Control.Monad
 import Control.Monad.Catch
 import Control.Monad.IO.Class
 import Control.Monad.Reader
+#if !MIN_VERSION_base(4,13,0)
+import Control.Monad.Fail
+#endif
 
 import HSChain.Control.Class
 import HSChain.Logger

hschain-PoW/test/TM/Coin.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP             #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies    #-}
 -- |
@@ -6,6 +7,9 @@ module TM.Coin (tests) where
 import Control.Lens
 import Control.Monad.IO.Class
 import Control.Monad.State.Strict
+#if !MIN_VERSION_base(4,13,0)
+import Control.Monad.Fail         (MonadFail)
+#endif
 import Data.Coerce
 import Data.List (sort)
 import Test.Tasty

hschain-PoW/test/TM/Util/Mockchain.hs

@@ -11,9 +11,6 @@ module TM.Util.Mockchain where
 import Codec.Serialise
 import Control.Applicative
 import Control.Monad.Catch
-#if !MIN_VERSION_base(4,13,0)
-import Control.Monad.Fail         (MonadFail)
-#endif
 import Data.Bits
 import Data.List  (unfoldr)
 import Data.Word

hschain-examples/HSChain/Mock/Types.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                  #-}
 {-# LANGUAGE DataKinds            #-}
 {-# LANGUAGE DeriveGeneric        #-}
 {-# LANGUAGE DerivingVia          #-}
@@ -25,11 +26,15 @@ module HSChain.Mock.Types (
   , HSChainCfg
     -- * Helpers
   , makeGenesis
+  , MonadFail
   ) where
 
 import Control.Exception   (Exception)
 import Control.Monad
 import Control.Monad.Catch (MonadCatch(..),MonadThrow(..))
+#if !MIN_VERSION_base(4,13,0)
+import Control.Monad.Fail  (MonadFail)
+#endif
 import Data.Default.Class
 import Data.Typeable
 import Data.Word

hschain-examples/test/TM/Util/MockChain.hs

@@ -10,12 +10,12 @@ module TM.Util.MockChain where
 
 import Control.Monad.Catch
 import Control.Monad.Reader
+#if !MIN_VERSION_base(4,13,0)
+import Control.Monad.Fail (MonadFail)
+#endif
 import           Data.List (sortOn)
 import qualified Data.Map.Strict    as Map
 import qualified Data.List.NonEmpty as NE
-#if !MIN_VERSION_base(4,13,0)
-import Control.Monad.Fail         (MonadFail)
-#endif
 
 import HSChain.Control.Class
 import HSChain.Crypto

nix/overrides.nix

@@ -20,9 +20,9 @@
   };
   # Compiler specific overrides
   ghc865 = {
+    servant-server = { check = false; };
   };
   ghc883 = {
-    katip = { jailbreak = true; };
   };
   ghcjs = {
     SHA                   = { check = false; };

nix/release.nix

@@ -48,8 +48,6 @@ let
     hschain-db             = callInternal hsPkgs "hschain" ../hschain-db             {} "";
     hschain-net            = callInternal hsPkgs "hschain" ../hschain-net            {} "";
     hschain-config         = callInternal hsPkgs "hschain" ../hschain-config         {} "";
-    hschain-pow-func       = callInternal hsPkgs "hschain" ../proof-of-work/full-mining {} "";
-    hschain-pow-check      = callInternal hsPkgs "hschain" ../proof-of-work/lightweight-check {} "";
     hschain-PoW            = callInternal hsPkgs "hschain" ../hschain-PoW            {} "";
     hschain                = callInternal hsPkgs "hschain" ../hschain                {} "";
     hschain-examples       = callInternal hsPkgs "hschain" ../hschain-examples       {} "";
@@ -76,28 +74,9 @@ let
     '';
   #
   release = let
-    hschainPkgAll = p: with p; [
-      serialise-cddl
-      bls-signatures
-      hschain-crypto
-      hschain-crypto-bls
-      hschain-types
-      hschain-merkle
-      hschain-mempool
-      hschain-logger
-      hschain-config
-      hschain-quickcheck
-      hschain-control
-      hschain-net
-      hschain-db
-      hschain-pow-func
-      hschain-pow-check
-      hschain-PoW
-      hschain
-      hschain-examples
-      hschain-examples-types
-    ];
-    hschainPkgJs = p: with p; [
+    # All packages mentioned in hschainPackages
+    hschainPkgAll = p: map (nm: p."${nm}") (builtins.attrNames (hschainPackages {}));
+    hschainPkgJs  = p: with p; [
       hschain-crypto
       hschain-control
       hschain-types