Merge pull request #9 from haskell-works/add-ghc-8.8.2-to-ci

Add ghc-8.8.2 to ci

.circleci/config.yml

@@ -1,35 +1,53 @@
 version: 2.1
 
 orbs:
-  haskell: haskell-works/haskell-build-2@1.6.16
-  github: haskell-works/github-release@1.2.1
-  hackage: haskell-works/hackage@1.0.0
+  haskell: haskell-works/haskell-build@4.0.5
+  github: haskell-works/github-release@1.3.3
+  hackage: haskell-works/hackage@1.2.0
 
 workflows:
   multiple-ghc-build:
     jobs:
-      - haskell/build:
+      - haskell/build-with-binary-cache:
           name: GHC 8.2.2
           executor: haskell/ghc-8_2_2
           context: haskell-ci
+          binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
+          cabal-build-extra: --write-ghc-environment-files=ghc8.4.4+
+          cabal-test-extra: --test-show-details=direct
 
-      - haskell/build:
+      - haskell/build-with-binary-cache:
           name: GHC 8.4.4
           executor: haskell/ghc-8_4_4
           context: haskell-ci
+          binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
+          cabal-build-extra: --write-ghc-environment-files=ghc8.4.4+
+          cabal-test-extra: --test-show-details=direct
 
-      - haskell/build:
-          name: GHC 8.6.4
-          executor: haskell/ghc-8_6_4
+      - haskell/build-with-binary-cache:
+          name: GHC 8.6.5
+          executor: haskell/ghc-8_6_5
           context: haskell-ci
+          binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
+          cabal-build-extra: --write-ghc-environment-files=ghc8.4.4+
+          cabal-test-extra: --test-show-details=direct
+
+      - haskell/build-with-binary-cache:
+          name: GHC 8.8.2
+          executor: haskell/ghc-8_8_2
+          context: haskell-ci
+          binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"}
+          cabal-build-extra: --write-ghc-environment-files=ghc8.4.4+
+          cabal-test-extra: --test-show-details=direct
 
       - github/release-cabal:
           name: GitHub Release
           context: haskell-ci
           requires:
             - GHC 8.2.2
             - GHC 8.4.4
-            - GHC 8.6.4
+            - GHC 8.6.5
+            - GHC 8.8.2
           checkout: true
           filters:
             branches:

hw-conduit-merges.cabal

@@ -1,3 +1,5 @@
+cabal-version:  2.4
+
 name:           hw-conduit-merges
 version:        0.2.0.0
 synopsis:       Additional merges and joins for Conduit
@@ -8,47 +10,52 @@ bug-reports:    https://github.com/haskell-works/hw-conduit-merges/issues
 author:         Alexey Raga
 maintainer:     alexey.raga@gmail.com
 copyright:      Alexey Raga
-license:        BSD3
+license:        BSD-3-Clause
 license-file:   LICENSE
 build-type:     Simple
-cabal-version:  >= 1.10
 
 source-repository head
   type: git
   location: https://github.com/haskell-works/hw-conduit-merges
 
+common base                 { build-depends: base                 >= 4.7    && <  5   }
+
+common bytestring           { build-depends: bytestring                               }
+common conduit              { build-depends: conduit              >= 1.3              }
+common conduit-extra        { build-depends: conduit-extra                            }
+common hspec                { build-depends: hspec                                    }
+common hw-conduit-merges    { build-depends: hw-conduit-merges                        }
+common mtl                  { build-depends: mtl                                      }
+common QuickCheck           { build-depends: QuickCheck                               }
+
+common config
+  default-language:     Haskell2010
+  ghc-options:          -Wall
+
 library
-  exposed-modules:
-      HaskellWorks.Data.Conduit.Merge
-  other-modules:
-      Paths_hw_conduit_merges
-  hs-source-dirs:
-      src
-  ghc-options: -Wall
-  build-depends:
-      base >=4.7 && <5
-    , conduit >=1.3
-    , conduit-extra
-    , mtl
-  default-language: Haskell2010
+  import:               base, config
+                      , conduit
+                      , conduit-extra
+                      , mtl
+  exposed-modules:      HaskellWorks.Data.Conduit.Merge
+  other-modules:        Paths_hw_conduit_merges
+  autogen-modules:      Paths_hw_conduit_merges
+  hs-source-dirs:       src
 
 test-suite hw-conduit-merges-test
-  type: exitcode-stdio-1.0
-  main-is: Spec.hs
-  other-modules:
-      HaskellWorks.Data.Conduit.LeftoverSpec
-      HaskellWorks.Data.Conduit.MergeSpec
-      Paths_hw_conduit_merges
-  hs-source-dirs:
-      test
-  ghc-options: -Wall -threaded -rtsopts -with-rtsopts=-N -fno-warn-type-defaults
-  build-depends:
-      QuickCheck
-    , base
-    , bytestring
-    , conduit >=1.3
-    , conduit-extra
-    , hspec
-    , hw-conduit-merges
-    , mtl
-  default-language: Haskell2010
+  import:               base, config
+                      , QuickCheck
+                      , bytestring
+                      , conduit
+                      , conduit-extra
+                      , hspec
+                      , hw-conduit-merges
+                      , mtl
+  type:                 exitcode-stdio-1.0
+  main-is:              Spec.hs
+  other-modules:        HaskellWorks.Data.Conduit.LeftoverSpec
+                        HaskellWorks.Data.Conduit.MergeSpec
+                        Paths_hw_conduit_merges
+  autogen-modules:      Paths_hw_conduit_merges
+  hs-source-dirs:       test
+  ghc-options:          -threaded -rtsopts -with-rtsopts=-N -fno-warn-type-defaults

stack.yaml.lock

@@ -0,0 +1,12 @@
+# This file was autogenerated by Stack.
+# You should not edit this file by hand.
+# For more information, please see the documentation at:
+#   https://docs.haskellstack.org/en/stable/lock_files
+
+packages: []
+snapshots:
+- completed:
+    size: 503685
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/12/11.yaml
+    sha256: a5cd71e5e76dc24426ab086adc0df15a4532b463284c75f4d1f1700b2fb9856c
+  original: lts-12.11