diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2019-12-28 23:45:57 +0100 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2019-12-29 16:35:59 +0100 |
| commit | 6fc491ce84b41939d8080cff56c3a5c98cb7e1df (patch) | |
| tree | ff8c950745fbab0a9688683bd5fc640ab1229462 | |
| parent | 5c80fe47613be6e1ea0756d7de7b2c2bd300dd69 (diff) | |
Add GHC 8.8 support
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | cabal-helper.cabal | 8 | ||||
| -rw-r--r-- | tests/CompileTest.hs | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81524fc..e60885f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,11 @@ before_script: # CI images are built with scripts/build-ci-images.sh +job-ghc8.8: + image: registry.gitlab.com/dxld/cabal-helper/ci:ghc-8.8.1--cabal-install-3.0.0.0--stack-2.1.3 + stage: build + script: "$CI_PROJECT_DIR/scripts/ci/build.sh" + job-ghc8.6: image: registry.gitlab.com/dxld/cabal-helper/ci:ghc-8.6.5--cabal-install-3.0.0.0--stack-2.1.3 stage: build diff --git a/cabal-helper.cabal b/cabal-helper.cabal index 81c94f9..4b642e2 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -86,7 +86,7 @@ common build-deps , Cabal < 3.1 && >= 3.0 || < 2.5 && >= 2.0 || < 1.26 && >= 1.24.2.0 - , cabal-plan < 0.6 && >= 0.5.0.0 + , cabal-plan < 0.7 && >= 0.5.0.0 , clock < 0.8 && >= 0.7.2 , containers < 1 && >= 0.5.7.1 , bytestring < 0.11 && >= 0.10.8.1 @@ -98,9 +98,9 @@ common build-deps , semigroupoids < 5.4 && >= 5.2 , SHA < 1.7 && >= 1.6.4.4 , text < 1.3 && >= 1.0.0.0 - , template-haskell < 2.15 && >= 2.11.1.0 + , template-haskell < 2.16 && >= 2.11.1.0 , temporary < 1.3 && >= 1.2.1 - , time < 1.9 && >= 1.6.0.1 + , time < 1.10 && >= 1.6.0.1 , transformers < 0.6 && >= 0.5.2.0 , utf8-string < 1.1 && >= 1.0.1.1 if os(windows) @@ -181,7 +181,7 @@ test-suite ghc-session main-is: GhcSession.hs hs-source-dirs: tests ghc-options: -Wall - build-depends: ghc < 8.7 && >= 8.0.2 + build-depends: ghc < 8.9 && >= 8.0.2 , ghc-paths < 0.2 && >= 0.1.0.9 , pretty-show < 1.9 && >= 1.8.1 , cabal-helper diff --git a/tests/CompileTest.hs b/tests/CompileTest.hs index 1c76787..1b024d2 100644 --- a/tests/CompileTest.hs +++ b/tests/CompileTest.hs @@ -112,6 +112,7 @@ allCabalVersions (GhcVersion ghc_ver) = do , ("8.2", ">= 1.24.2.0 ") , ("8.4", ">= 2.0.0.2 ") , ("8.6", ">= 2.0.0.2 ") + , ("8.8", ">= 3.0.0.0 ") ] return $ reverse $ map (flip withinRange'CH constraint &&& id) cabal_versions |