Skip to content

Commit 976e0f9

Browse files
committed
Update platforms for release jobs
* Drop deb9, ubuntu18 and centos7 jobs which are all EOL * Add ubuntu24_04 * Build a very old alpine bindist (3.12) and a new one (3.20) * Only build 3_20 bindist for alpine i386. The list of release platforms after this commit is Linux * x86_64 - deb10 - deb11 - deb12 - fedora33 - fedora36 - fedora38 - rocky8 - ubuntu20_04 - ubuntu22_04 - ubuntu24_04 - alpine3_12 - alpine3_20 * i386 - deb10 - alpine3_20 * aarch64 - deb10 - deb11 - deb12 - alpine3_18 Darwin * x86_64 * aarch64 Windows * x86_64
1 parent e727299 commit 976e0f9

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ stages:
33

44
variables:
55
# Commit of ghc/ci-images repository from which to pull Docker images
6-
DOCKER_REV: "a9297a370025101b479cfd4977f8f910814e03ab"
6+
DOCKER_REV: "df20b2eb2fcc1c93aed5ad047c65752fbd4c38d4"
77

88
GHC_VERSION: 9.10.2
99
CABAL_INSTALL_VERSION: 3.14.2.0
@@ -33,30 +33,20 @@ linux:
3333
- ARCH: i386
3434
TAG: x86_64-linux
3535
OS:
36-
- deb9
3736
- deb10
3837
- ARCH: x86_64
3938
TAG: x86_64-linux
4039
OS:
41-
- deb9
4240
- deb10
4341
- deb11
4442
- deb12
4543
- fedora33
4644
- fedora36
4745
- fedora38
4846
- rocky8
49-
- ubuntu18_04
5047
- ubuntu20_04
5148
- ubuntu22_04
52-
# Pull this one from the future, since it's missing.
53-
# We can't move the entire file to this DOCKER_REV, because
54-
# i386-linux-deb9 is missing from it.
55-
- ARCH: x86_64
56-
TAG: x86_64-linux
57-
OS: centos7
58-
DOCKER_REV: f2d12519f45a13a61fcca03a949f927ceead6492
59-
49+
- ubuntu24_04
6050
- ARCH: aarch64
6151
TAG: aarch64-linux
6252
OS:
@@ -76,12 +66,11 @@ alpine-linux:
7666
extends: .build
7767
parallel:
7868
matrix:
79-
- ARCH: [i386, x86_64]
80-
OS: [alpine3_12, alpine3_15, alpine3_17]
69+
- ARCH: [x86_64]
70+
OS: [alpine3_12, alpine3_20]
8171
TAG: x86_64-linux
82-
# Was 3_18 for i386 intentionally left off?
83-
- ARCH: x86_64
84-
OS: alpine3_18
72+
- ARCH: [i386]
73+
OS: alpine3_20
8574
TAG: x86_64-linux
8675
- ARCH: [aarch64]
8776
OS: [alpine3_18]

0 commit comments

Comments
 (0)