diff options
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | cabal-helper.cabal | 2 | ||||
| -rw-r--r-- | tests/CompileTest.hs | 41 |
3 files changed, 22 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7219384..7fffc64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,8 +25,3 @@ job-ghc7.10.3-cabal-install2.0.0.0: image: registry.gitlab.com/dxld/ghc-mod:ghc7.10.3-cabal-install2.0.0.0 stage: build script: "$CI_PROJECT_DIR/scripts/ci/build.sh" - -job-ghc7.8.4-cabal-install2.0.0.0: - image: registry.gitlab.com/dxld/ghc-mod:ghc7.8.4-cabal-install2.0.0.0 - stage: build - script: "$CI_PROJECT_DIR/scripts/ci/build.sh" diff --git a/cabal-helper.cabal b/cabal-helper.cabal index 9ec6101..fa071f0 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -182,7 +182,7 @@ test-suite ghc-session hs-source-dirs: tests ghc-options: -Wall build-depends: base < 5 && >= 4.7 - , ghc < 8.5 && >= 7.8 + , ghc < 8.5 && >= 7.10 , ghc-paths < 0.2 && >= 0.1.0.9 , cabal-helper diff --git a/tests/CompileTest.hs b/tests/CompileTest.hs index da75198..02f4c3b 100644 --- a/tests/CompileTest.hs +++ b/tests/CompileTest.hs @@ -76,24 +76,24 @@ allCabalVersions :: Version -> [Version] allCabalVersions ghc_ver = let cabal_versions :: [Version] cabal_versions = map parseVer - [ "1.18.0" - , "1.18.1" - , "1.18.1.1" - , "1.18.1.2" - , "1.18.1.3" - , "1.18.1.4" - , "1.18.1.5" - , "1.18.1.6" - , "1.18.1.7" - , "1.20.0.0" - , "1.20.0.1" - , "1.20.0.2" - , "1.20.0.3" - , "1.20.0.4" - , "1.22.0.0" - , "1.22.1.0" - , "1.22.1.1" - , "1.22.2.0" + -- , "1.18.0" + -- , "1.18.1" + -- , "1.18.1.1" + -- , "1.18.1.2" + -- , "1.18.1.3" + -- , "1.18.1.4" + -- , "1.18.1.5" + -- , "1.18.1.6" + -- , "1.18.1.7" + -- , "1.20.0.0" + -- , "1.20.0.1" + -- , "1.20.0.2" + -- , "1.20.0.3" + -- , "1.20.0.4" + -- , "1.22.0.0" + -- , "1.22.1.0" + -- , "1.22.1.1" + [ "1.22.2.0" , "1.22.3.0" , "1.22.4.0" , "1.22.5.0" @@ -119,14 +119,15 @@ allCabalVersions ghc_ver = let constraint_table = map (parseVer *** runReadP'Dist parse) $ - [ ("7.8" , ">= 1.18 && < 2") - , ("7.10" , ">= 1.22.2 && < 2") + -- , ("7.8" , ">= 1.18 && < 2") + [ ("7.10" , ">= 1.22.2 && < 2") , ("8.0.1", ">= 1.24 ") , ("8.0.2", ">= 1.24.2 ") , ("8.2.1", ">= 2.0.0.2 ") , ("8.2.2", ">= 2.0.0.2 ") , ("8.4.1", ">= 2.0.0.2 ") , ("8.4.2", ">= 2.2.0.1 ") + , ("8.6.1", ">= 2.4.0.0 ") ] in reverse $ filter (flip withinRange'CH constraint) cabal_versions |