Skip to content

Commit da40b2e

Browse files
DigitalBrains1rowanG077
authored andcommitted
Bump CI versions
1 parent 21f72f7 commit da40b2e

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.ci/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ RUN git clone https://github.com/verilator/verilator verilator \
111111

112112
FROM builder AS build-ghc
113113

114-
ARG ghcup_version="0.1.40.0"
114+
ARG ghcup_version="0.1.50.2"
115115

116116
# Must be explicitly set
117117
ARG ghc_version

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ elif [[ "$1" != "" ]]; then
1313
echo "Unrecognized argument: $1" >&2
1414
exit 1
1515
fi
16-
UBUNTU_VERSION=jammy-20250126
17-
GHC_VERSIONS=("9.10.2" "9.8.4" "9.6.7" "9.4.8" "9.2.8" "9.0.2" "8.10.7")
18-
CABAL_VERSIONS=("3.14.2.0" "3.14.2.0" "3.14.2.0" "3.14.2.0" "3.14.2.0" "3.14.2.0" "3.12.1.0")
16+
UBUNTU_VERSION=jammy-20251013
17+
GHC_VERSIONS=( "9.10.3" "9.8.4" "9.6.7")
18+
CABAL_VERSIONS=("3.14.2.0" "3.14.2.0" "3.14.2.0")
1919

2020
# We want to use docker buildkit so that our layers are built in parallel. This
2121
# is ignored completely on versions of docker which don't support buildkit.

.ci/gitlab/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.benchmark:
2-
image: ghcr.io/clash-lang/clash-ci:$GHC_VERSION-20251007
2+
image: ghcr.io/clash-lang/clash-ci:$GHC_VERSION-20251229
33
stage: test
44
timeout: 2 hours
55
variables:

.ci/gitlab/common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ default:
1212
timeout: 10 minutes
1313
stage: build
1414
variables:
15-
CLASH_DOCKER_TAG: 20251007
15+
CLASH_DOCKER_TAG: 20251229
1616
CACHE_BUST_TOKEN: 3
1717
# Note that we copy+paste the image name into CACHE_FALLBACK_KEY. If we don't,
1818
# $GHC_VERSION gets inserted at verbatim, instead of resolving to some ghc version.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ jobs:
147147

148148
# Run steps inside the clash CI docker image
149149
container:
150-
image: ghcr.io/clash-lang/clash-ci:${{ matrix.ghc }}-20251007
150+
image: ghcr.io/clash-lang/clash-ci:${{ matrix.ghc }}-20251229
151151

152152
env:
153153
THREADS: 2

.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ tests:
3434
CI_PARENT_PIPELINE_SOURCE: $CI_PIPELINE_SOURCE
3535
parallel:
3636
matrix:
37-
- GHC_VERSION: 9.10.2
37+
- GHC_VERSION: 9.10.3
3838
# TODO: remove this when https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12264#note_602406
3939
# is fixed
4040
SKIP_CLASH_FFI_EXAMPLE: "yes"

0 commit comments

Comments
 (0)