From 61c7719d40bef4fa8f153f0d89a451d02531d1b5 Mon Sep 17 00:00:00 2001 From: Martijn Bastiaan Date: Sat, 14 Dec 2024 10:40:41 +0100 Subject: [PATCH] Bump GHC versions on Docker images and rebuild --- .github/docker/build-and-publish-docker-image.sh | 6 ++++-- .github/workflows/ci.yml | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/docker/build-and-publish-docker-image.sh b/.github/docker/build-and-publish-docker-image.sh index fda016c..6dbdb0f 100755 --- a/.github/docker/build-and-publish-docker-image.sh +++ b/.github/docker/build-and-publish-docker-image.sh @@ -17,13 +17,15 @@ elif [[ "$1" != "" ]]; then fi UBUNTU_VERSION=jammy-20240125 -GHC_VERSIONS=( "9.6.6" "9.4.8" "9.2.8" "9.0.2") -CABAL_VERSION="3.10.2.0" +GHC_VERSIONS=( "9.10.1" "9.8.4" "9.6.6" "9.4.8" "9.2.8" "9.0.2") +CABAL_VERSION="3.12.1.0" for i in "${!GHC_VERSIONS[@]}" do GHC_VERSION="${GHC_VERSIONS[i]}" + # If you get an error like "unrecognized argument buildx", consider installing + # the buildx plugin for Docker. E.g., for Ubuntu: `apt install docker-buildx`. docker buildx build \ --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} \ --build-arg cabal_version=${CABAL_VERSION} \ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ef4356..71012d8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,7 +117,7 @@ jobs: - "9.6.6" container: - image: ghcr.io/clash-lang/clash-vexriscv-ci:${{ matrix.ghc }}-20240823 + image: ghcr.io/clash-lang/clash-vexriscv-ci:${{ matrix.ghc }}-20241214 steps: - name: Checkout