update CI config (add GHC 8.6, drop GHC 8.0)

1 files changed, 43 insertions, 20 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 626406a..2d5ef07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,44 +1,67 @@
 before_script:
 - apt update && apt -y -u upgrade
-- cabal update
-- cabal sandbox init
+- cabal new-update
 
 stages:
 - test
 - bench
 
-test:8.0:
-  image: clinty/haskell:8.0
-  script:
-  - cabal install --only-dependencies --enable-tests
-  - cabal test
-
 test:8.2:
   image: clinty/haskell:8.2
+  stage: test
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}-8.2
+    paths:
+    - dist-newstyle/
   script:
-  - cabal install --only-dependencies --enable-tests
-  - cabal test
+  - cabal new-test
 
 test:8.4:
   image: clinty/haskell:8.4
+  stage: test
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}-8.4
+    paths:
+    - dist-newstyle/
   script:
-  - cabal install --only-dependencies --enable-tests
-  - cabal test
+  - cabal new-test
 
-bench:8.0:
-  image: clinty/haskell:8.0
+test:8.6:
+  image: clinty/haskell:8.6
+  stage: test
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}-8.6
+    paths:
+    - dist-newstyle/
   script:
-  - cabal install --only-dependencies --enable-benchmarks
-  - cabal bench
+  - cabal new-test
 
 bench:8.2:
   image: clinty/haskell:8.2
+  stage: bench
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}-8.2
+    paths:
+    - dist-newstyle/
   script:
-  - cabal install --only-dependencies --enable-benchmarks
-  - cabal bench
+  - cabal new-bench
 
 bench:8.4:
   image: clinty/haskell:8.4
+  stage: bench
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}-8.4
+    paths:
+      - dist-newstyle/
+  script:
+  - cabal new-bench
+
+bench:8.6:
+  image: clinty/haskell:8.6
+  stage: bench
+  cache:
+    key: ${CI_COMMIT_REF_SLUG}-8.6
+    paths:
+      - dist-newstyle/
   script:
-  - cabal install --only-dependencies --enable-benchmarks
-  - cabal bench
+  - cabal new-bench