Skip to content

Commit 1306054

Browse files
committed
Prepare release 2.12.0.0
1 parent 808407b commit 1306054

File tree

12 files changed

+415
-300
lines changed

12 files changed

+415
-300
lines changed

.github/actions/bindist-actions/action-deb10/action.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ runs:
1111
entrypoint: .github/scripts/entrypoint.sh
1212
env:
1313
GHC_VERSION: ${{ inputs.version }}
14-
INSTALL: apt-get update && apt-get install -y
14+
INSTALL: sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list &&
15+
sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list &&
16+
sed -i /-updates/d /etc/apt/sources.list && apt-get update && apt-get install
17+
-y
1518
STAGE: ${{ inputs.stage }}
1619
TOOLS: libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev
1720
git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
1-
description: Container for deb9
1+
description: Container for deb13
22
inputs:
33
stage:
44
description: which stage to build
55
required: true
66
version:
77
description: which GHC version to build/test
88
required: false
9-
name: action-deb9
9+
name: action-deb13
1010
runs:
1111
entrypoint: .github/scripts/entrypoint.sh
1212
env:
1313
GHC_VERSION: ${{ inputs.version }}
14-
INSTALL: sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list &&
15-
sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list &&
16-
sed -i /-updates/d /etc/apt/sources.list && apt-get update && apt-get install
17-
-y
14+
INSTALL: apt-get update && apt-get install -y
1815
STAGE: ${{ inputs.stage }}
1916
TOOLS: libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev
2017
git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc
2118
autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5
2219
libtinfo5 patchelf
23-
image: debian:9
20+
image: debian:13
2421
using: docker

.github/generate-ci/gen_ci.hs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ osName Windows = "windows"
3232
osName (Linux d) = "linux-" ++ distroName d
3333

3434
data Distro
35-
= Debian9
36-
| Debian10
35+
= Debian10
3736
| Debian11
3837
| Debian12
38+
| Debian13
3939
| Ubuntu1804
4040
| Ubuntu2004
4141
| Ubuntu2204
@@ -64,14 +64,14 @@ artifactName arch opsys = archName arch ++ "-" ++ case opsys of
6464
data GHC
6565
= GHC967
6666
| GHC984
67-
| GHC9102
67+
| GHC9103
6868
| GHC9122
6969
deriving (Eq, Enum, Bounded)
7070

7171
ghcVersion :: GHC -> String
7272
ghcVersion GHC967 = "9.6.7"
7373
ghcVersion GHC984 = "9.8.4"
74-
ghcVersion GHC9102 = "9.10.2"
74+
ghcVersion GHC9103 = "9.10.3"
7575
ghcVersion GHC9122 = "9.12.2"
7676

7777
ghcVersionIdent :: GHC -> String
@@ -87,10 +87,10 @@ data Stage = Build GHC | Bindist | Test
8787
-------------------------------------------------------------------------------
8888

8989
distroImage :: Distro -> String
90-
distroImage Debian9 = "debian:9"
9190
distroImage Debian10 = "debian:10"
9291
distroImage Debian11 = "debian:11"
9392
distroImage Debian12 = "debian:12"
93+
distroImage Debian13 = "debian:13"
9494
distroImage Ubuntu1804 = "ubuntu:18.04"
9595
distroImage Ubuntu2004 = "ubuntu:20.04"
9696
distroImage Ubuntu2204 = "ubuntu:22.04"
@@ -102,10 +102,10 @@ distroImage Fedora40 = "fedora:40"
102102
distroImage Rocky8 = "rockylinux:8"
103103

104104
distroName :: Distro -> String
105-
distroName Debian9 = "deb9"
106105
distroName Debian10 = "deb10"
107106
distroName Debian11 = "deb11"
108107
distroName Debian12 = "deb12"
108+
distroName Debian13 = "deb13"
109109
distroName Ubuntu1804 = "ubuntu1804"
110110
distroName Ubuntu2004 = "ubuntu2004"
111111
distroName Ubuntu2204 = "ubuntu2204"
@@ -117,10 +117,10 @@ distroName Fedora40 = "fedora40"
117117
distroName Rocky8 = "unknown"
118118

119119
distroInstall :: Distro -> String
120-
distroInstall Debian9 = "sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && apt-get update && apt-get install -y"
121-
distroInstall Debian10 = "apt-get update && apt-get install -y"
120+
distroInstall Debian10 = "sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list && sed -i /-updates/d /etc/apt/sources.list && apt-get update && apt-get install -y"
122121
distroInstall Debian11 = "apt-get update && apt-get install -y"
123122
distroInstall Debian12 = "apt-get update && apt-get install -y"
123+
distroInstall Debian13 = "apt-get update && apt-get install -y"
124124
distroInstall Ubuntu1804 = "apt-get update && apt-get install -y"
125125
distroInstall Ubuntu2004 = "apt-get update && apt-get install -y"
126126
distroInstall Ubuntu2204 = "apt-get update && apt-get install -y"
@@ -132,10 +132,10 @@ distroInstall Fedora40 = "dnf install -y"
132132
distroInstall Rocky8 = "yum -y install epel-release && yum install -y --allowerasing"
133133

134134
distroTools :: Distro -> String
135-
distroTools Debian9 = "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
136135
distroTools Debian10 = "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
137136
distroTools Debian11 = "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
138137
distroTools Debian12 = "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
138+
distroTools Debian13 = "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
139139
distroTools Ubuntu1804 = "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
140140
distroTools Ubuntu2004 = "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
141141
distroTools Ubuntu2204 = "libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"

.github/scripts/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ test_all_hls() {
6060
fi
6161
done
6262
# install the recommended GHC version so the wrapper can launch HLS
63-
ghcup install ghc --set 9.10.2
63+
ghcup install ghc --set 9.10.3
6464
"$bindir/haskell-language-server-wrapper${ext}" typecheck "${test_module}" || fail "failed to typecheck with HLS wrapper"
6565
}
6666

0 commit comments

Comments
 (0)