CI: Upgrade 8.10 to 8.10.7, Haddock to 9.0.2

Now that the ghc package documentation is on Hackage for 8.10.7, we can
upgrade our build version.

Furthermore, we now build Haddock documentation for Hackage with 9.0.2
now.

This fixes a Haddock bug we encountered:

Fixes #2200

Author: DigitalBrains1

.ci/docker/Dockerfile

@@ -107,7 +107,7 @@ RUN git clone https://github.com/verilator/verilator verilator \
 
 FROM builder AS build-ghc
 
-ARG ghcup_version="0.1.17.4"
+ARG ghcup_version="0.1.17.7"
 
 # Must be explicitly set
 ARG ghc_version

.ci/docker/build-and-publish-docker-image.sh

@@ -7,7 +7,7 @@ NAME="clash-ci-"
 DIR=$(dirname "$0")
 now=$(date +%F)
 
-GHC_VERSIONS=(  "9.0.2"   "8.10.2"  "8.8.4"   "8.6.5")
+GHC_VERSIONS=(  "9.0.2"   "8.10.7"  "8.8.4"   "8.6.5")
 CABAL_VERSIONS=("3.4.0.0" "3.2.0.0" "3.2.0.0" "3.0.0.0")
 
 # We want to use docker buildkit so that our layers are built in parallel. This

.ci/gitlab/benchmark.yml

@@ -1,5 +1,5 @@
 .benchmark:
-  image: ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2022-02-02
+  image: ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2022-05-10
   stage: test
   timeout: 2 hours
   variables:

.ci/gitlab/common.yml

@@ -1,5 +1,5 @@
 .common:
-  image: ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2022-02-02
+  image: ghcr.io/clash-lang/clash-ci-$GHC_VERSION:2022-05-10
   timeout: 2 hours
   stage: build
   variables:

.github/workflows/ci.yml

@@ -92,7 +92,7 @@ jobs:
 
     # Run steps inside the clash CI docker image
     container:
-      image: ghcr.io/clash-lang/clash-ci-${{ matrix.ghc }}:2022-02-02
+      image: ghcr.io/clash-lang/clash-ci-${{ matrix.ghc }}:2022-05-10
 
       env:
         THREADS: 2

.gitlab-ci.yml

@@ -10,7 +10,7 @@ include:
 variables:
   # Default GHC / Cabal version. Used for generating Haddock and releasing to
   # Hackage.
-  GHC_VERSION: 8.10.2
+  GHC_VERSION: 8.10.7
 
   # https://docs.gitlab.com/runner/executors/custom.html#system-failure
   GET_SOURCES_ATTEMPTS: 5
@@ -49,7 +49,7 @@ tests-8.8:
 tests-8.10:
   extends: .common-trigger
   variables:
-    GHC_VERSION: 8.10.2
+    GHC_VERSION: 8.10.7
 
 tests-9.0:
   extends: .common-trigger
@@ -61,7 +61,7 @@ stack-build:
   needs: []
   stage: test
   variables:
-    GHC_VERSION: 8.10.2
+    GHC_VERSION: 8.10.7
   script:
     - .ci/stack_build.sh
   # Run on shared runners
@@ -89,6 +89,8 @@ haddock:
   extends: .common
   needs: []
   stage: test
+  variables:
+    GHC_VERSION: 9.0.2
   artifacts:
     paths:
       - hadocs/*/*