Update CI w.r.t. GHC 9.0

clash-lang · Mar 18, 2021 · 94eba78 · 94eba78
1 parent 2bb30c9
commit 94eba78
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.ci/docker/Dockerfile b/.ci/docker/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update \
  && cd .. \
  && rm -rf ghdl-0.37
 
-ARG GHCUP_VERSION="0.1.12"
+ARG GHCUP_VERSION="0.1.14"
 ARG GHCUP_URL="https://downloads.haskell.org/~ghcup/${GHCUP_VERSION}/x86_64-linux-ghcup-${GHCUP_VERSION}"
 ARG GHCUP_BIN=/usr/bin/ghcup
 
@@ -38,7 +38,7 @@ RUN curl $GHCUP_URL --output $GHCUP_BIN \
  && ghcup install cabal 2.4.1.0 \
  && ghcup install cabal 3.0.0.0 \
  && ghcup install cabal 3.2.0.0 \
- && ghcup install cabal 3.4.0.0-rc4
+ && ghcup install cabal 3.4.0.0
 
 ARG ghc_version
 ENV GHC_VERSION=$ghc_version

diff --git a/.ci/gitlab/benchmark.yml b/.ci/gitlab/benchmark.yml
@@ -1,5 +1,5 @@
 .benchmark:
-  image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-02-08
+  image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-03-18
   stage: test
   timeout: 2 hours
   variables:

diff --git a/.ci/gitlab/common.yml b/.ci/gitlab/common.yml
@@ -1,5 +1,5 @@
 .common:
-  image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-02-08
+  image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-03-18
   timeout: 2 hours
   stage: build
   variables:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -116,7 +116,7 @@ aliases:
 
   - &build_default
     docker:
-      - image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-02-08
+      - image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-03-18
         # Read-only permissions
         auth:
           username: clash-lang-builder
@@ -133,7 +133,7 @@ aliases:
       - *run_tests
   - &build_with_stack
     docker:
-      - image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-02-08
+      - image: docker.pkg.github.com/clash-lang/clash-compiler/clash-ci-$GHC_VERSION:2021-03-18
         # Read-only permissions
         auth:
           username: clash-lang-builder

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -55,9 +55,8 @@ tests-8.10:
 tests-9.0:
   extends: .common-trigger
   variables:
-    GHC_HEAD: "yes" # We need the HEAD overlay for now
     GHC_VERSION: 9.0.1
-    CABAL_VERSION: 3.4.0.0-rc4
+    CABAL_VERSION: 3.4.0.0
 
 # Tests run on shared runners:
 haddock: