Skip to content

Commit b8203c3

Browse files
committed
Prepare release 2.11.0.0
1 parent e00b5dd commit b8203c3

File tree

14 files changed

+1272
-363
lines changed

14 files changed

+1272
-363
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
description: Container for deb12
2+
inputs:
3+
stage:
4+
description: which stage to build
5+
required: true
6+
version:
7+
description: which GHC version to build/test
8+
required: false
9+
name: action-deb12
10+
runs:
11+
entrypoint: .github/scripts/entrypoint.sh
12+
env:
13+
GHC_VERSION: ${{ inputs.version }}
14+
INSTALL: apt-get update && apt-get install -y
15+
STAGE: ${{ inputs.stage }}
16+
TOOLS: libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev
17+
git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc
18+
autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5
19+
libtinfo5 patchelf
20+
image: debian:12
21+
using: docker
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
description: Container for fedora40
2+
inputs:
3+
stage:
4+
description: which stage to build
5+
required: true
6+
version:
7+
description: which GHC version to build/test
8+
required: false
9+
name: action-fedora40
10+
runs:
11+
entrypoint: .github/scripts/entrypoint.sh
12+
env:
13+
GHC_VERSION: ${{ inputs.version }}
14+
INSTALL: dnf install -y
15+
STAGE: ${{ inputs.stage }}
16+
TOOLS: autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs
17+
findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs
18+
ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which
19+
xz zlib-devel patchelf
20+
image: fedora:40
21+
using: docker
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
description: Container for mint213
2+
inputs:
3+
stage:
4+
description: which stage to build
5+
required: true
6+
version:
7+
description: which GHC version to build/test
8+
required: false
9+
name: action-mint213
10+
runs:
11+
entrypoint: .github/scripts/entrypoint.sh
12+
env:
13+
GHC_VERSION: ${{ inputs.version }}
14+
INSTALL: apt-get update && apt-get install -y
15+
STAGE: ${{ inputs.stage }}
16+
TOOLS: libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev
17+
git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc
18+
autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5
19+
libtinfo5 patchelf
20+
image: linuxmintd/mint21.3-amd64
21+
using: docker

.github/generate-ci/gen_ci.hs

+17-2
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,16 @@ data Distro
3535
= Debian9
3636
| Debian10
3737
| Debian11
38+
| Debian12
3839
| Ubuntu1804
3940
| Ubuntu2004
4041
| Ubuntu2204
4142
| Mint193
4243
| Mint202
44+
| Mint213
4345
| Fedora27
4446
| Fedora33
47+
| Fedora40
4548
| Centos7
4649
| Rocky8
4750
deriving (Eq, Enum, Bounded)
@@ -64,15 +67,15 @@ data GHC
6467
= GHC948
6568
| GHC967
6669
| GHC984
67-
| GHC9101
70+
| GHC9102
6871
| GHC9122
6972
deriving (Eq, Enum, Bounded)
7073

7174
ghcVersion :: GHC -> String
7275
ghcVersion GHC948 = "9.4.8"
7376
ghcVersion GHC967 = "9.6.7"
7477
ghcVersion GHC984 = "9.8.4"
75-
ghcVersion GHC9101 = "9.10.1"
78+
ghcVersion GHC9102 = "9.10.2"
7679
ghcVersion GHC9122 = "9.12.2"
7780

7881
ghcVersionIdent :: GHC -> String
@@ -91,55 +94,67 @@ distroImage :: Distro -> String
9194
distroImage Debian9 = "debian:9"
9295
distroImage Debian10 = "debian:10"
9396
distroImage Debian11 = "debian:11"
97+
distroImage Debian12 = "debian:12"
9498
distroImage Ubuntu1804 = "ubuntu:18.04"
9599
distroImage Ubuntu2004 = "ubuntu:20.04"
96100
distroImage Ubuntu2204 = "ubuntu:22.04"
97101
distroImage Mint193 = "linuxmintd/mint19.3-amd64"
98102
distroImage Mint202 = "linuxmintd/mint20.2-amd64"
103+
distroImage Mint213 = "linuxmintd/mint21.3-amd64"
99104
distroImage Fedora27 = "fedora:27"
100105
distroImage Fedora33 = "fedora:33"
106+
distroImage Fedora40 = "fedora:40"
101107
distroImage Centos7 = "centos:7"
102108
distroImage Rocky8 = "rockylinux:8"
103109

104110
distroName :: Distro -> String
105111
distroName Debian9 = "deb9"
106112
distroName Debian10 = "deb10"
107113
distroName Debian11 = "deb11"
114+
distroName Debian12 = "deb12"
108115
distroName Ubuntu1804 = "ubuntu1804"
109116
distroName Ubuntu2004 = "ubuntu2004"
110117
distroName Ubuntu2204 = "ubuntu2204"
111118
distroName Mint193 = "mint193"
112119
distroName Mint202 = "mint202"
120+
distroName Mint213 = "mint213"
113121
distroName Fedora27 = "fedora27"
114122
distroName Fedora33 = "fedora33"
123+
distroName Fedora40 = "fedora40"
115124
distroName Centos7 = "centos7"
116125
distroName Rocky8 = "unknown"
117126

118127
distroInstall :: Distro -> String
119128
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"
120129
distroInstall Debian10 = "apt-get update && apt-get install -y"
121130
distroInstall Debian11 = "apt-get update && apt-get install -y"
131+
distroInstall Debian12 = "apt-get update && apt-get install -y"
122132
distroInstall Ubuntu1804 = "apt-get update && apt-get install -y"
123133
distroInstall Ubuntu2004 = "apt-get update && apt-get install -y"
124134
distroInstall Ubuntu2204 = "apt-get update && apt-get install -y"
125135
distroInstall Mint193 = "apt-get update && apt-get install -y"
126136
distroInstall Mint202 = "apt-get update && apt-get install -y"
137+
distroInstall Mint213 = "apt-get update && apt-get install -y"
127138
distroInstall Fedora27 = "dnf install -y"
128139
distroInstall Fedora33 = "dnf install -y"
140+
distroInstall Fedora40 = "dnf install -y"
129141
distroInstall Centos7 = "sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && yum -y install epel-release && yum install -y"
130142
distroInstall Rocky8 = "yum -y install epel-release && yum install -y --allowerasing"
131143

132144
distroTools :: Distro -> String
133145
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"
134146
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"
135147
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"
148+
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"
136149
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"
137150
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"
138151
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"
139152
distroTools Mint193 = "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"
140153
distroTools Mint202 = "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"
154+
distroTools Mint213 = "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"
141155
distroTools Fedora27 = "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
142156
distroTools Fedora33 = "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
157+
distroTools Fedora40 = "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
143158
distroTools Centos7 = "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
144159
distroTools Rocky8 = "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
145160

.github/scripts/test.sh

+1-1
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.1
63+
ghcup install ghc --set 9.10.2
6464
"$bindir/haskell-language-server-wrapper${ext}" typecheck "${test_module}" || fail "failed to typecheck with HLS wrapper"
6565
}
6666

0 commit comments

Comments
 (0)