diff options
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | cabal-helper.cabal | 18 | ||||
| -rw-r--r-- | cabal.project | 1 | ||||
| -rw-r--r-- | scripts/ci/steps/20-sdist.sh | 1 |
4 files changed, 16 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e8b6a7..18663b7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,11 @@ before_script: - rm -rf ~/.cabal/store - ln -s /cache/store ~/.cabal/store +job-ghc8.6.2-cabal-install2.4.0.0: + image: registry.gitlab.com/dxld/ghc-mod:ghc8.6.2-cabal-install2.4.0.0 + stage: build + script: "$CI_PROJECT_DIR/scripts/ci/build.sh" + job-ghc8.4.4-cabal-install2.2.0.0: image: registry.gitlab.com/dxld/ghc-mod:ghc8.4.4-cabal-install2.2.0.0 stage: build diff --git a/cabal-helper.cabal b/cabal-helper.cabal index 585a021..ed80e45 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -122,10 +122,10 @@ library c-h-internal , mtl < 2.3 && >= 2.0 , process < 1.7 && >= 1.2.3.0 , pretty-show < 1.9 && >= 1.8.1 - , semigroupoids < 5.3 && >= 5.2 + , semigroupoids < 5.4 && >= 5.2 , SHA < 1.7 && >= 1.6.4.4 , text < 1.3 && >= 1.0.0.0 - , template-haskell < 2.14 && >= 2.7.0.0 + , template-haskell < 2.15 && >= 2.7.0.0 , temporary < 1.3 && >= 1.2.1 , transformers < 0.6 && >= 0.3.0.0 if !os(windows) @@ -163,10 +163,10 @@ library , mtl < 2.3 && >= 2.0 , process < 1.7 && >= 1.2.3.0 , pretty-show < 1.9 && >= 1.8.1 - , semigroupoids < 5.3 && >= 5.2 + , semigroupoids < 5.4 && >= 5.2 , SHA < 1.7 && >= 1.6.4.4 , text < 1.3 && >= 1.0.0.0 - , template-haskell < 2.14 && >= 2.7.0.0 + , template-haskell < 2.15 && >= 2.7.0.0 , temporary < 1.3 && >= 1.2.1 , transformers < 0.6 && >= 0.3.0.0 if !os(windows) @@ -202,10 +202,10 @@ test-suite compile-test , mtl < 2.3 && >= 2.0 , process < 1.7 && >= 1.2.3.0 , pretty-show < 1.9 && >= 1.8.1 - , semigroupoids < 5.3 && >= 5.2 + , semigroupoids < 5.4 && >= 5.2 , SHA < 1.7 && >= 1.6.4.4 , text < 1.3 && >= 1.0.0.0 - , template-haskell < 2.14 && >= 2.7.0.0 + , template-haskell < 2.15 && >= 2.7.0.0 , temporary < 1.3 && >= 1.2.1 , transformers < 0.6 && >= 0.3.0.0 if !os(windows) @@ -223,7 +223,7 @@ test-suite ghc-session hs-source-dirs: tests ghc-options: -Wall build-depends: base < 5 && >= 4.7 - , ghc < 8.5 && >= 7.10 + , ghc < 8.7 && >= 7.10 , ghc-paths < 0.2 && >= 0.1.0.9 , cabal-helper , c-h-internal @@ -245,10 +245,10 @@ test-suite ghc-session , mtl < 2.3 && >= 2.0 , process < 1.7 && >= 1.2.3.0 , pretty-show < 1.9 && >= 1.8.1 - , semigroupoids < 5.3 && >= 5.2 + , semigroupoids < 5.4 && >= 5.2 , SHA < 1.7 && >= 1.6.4.4 , text < 1.3 && >= 1.0.0.0 - , template-haskell < 2.14 && >= 2.7.0.0 + , template-haskell < 2.15 && >= 2.7.0.0 , temporary < 1.3 && >= 1.2.1 , transformers < 0.6 && >= 0.3.0.0 if !os(windows) diff --git a/cabal.project b/cabal.project index f9f2091..6c7bbcf 100644 --- a/cabal.project +++ b/cabal.project @@ -1 +1,2 @@ packages: . cabal-plan/ +allow-newer: cabal-plan:base cabal-plan:containers diff --git a/scripts/ci/steps/20-sdist.sh b/scripts/ci/steps/20-sdist.sh index ab98061..329aa86 100644 --- a/scripts/ci/steps/20-sdist.sh +++ b/scripts/ci/steps/20-sdist.sh @@ -2,6 +2,7 @@ mkdir -p "$source_dir" mkdir -p "$build_dir" cabal act-as-setup -- sdist --output-directory="$source_dir" +cp cabal.project "$source_dir"/cabal.project if [ -d cabal-plan/ ]; then ( |