Skip to content

Commit 941fdb7

Browse files
July541fendor
July541
authored and
fendor
committed
Move to ghc-9.4.5 and drop ghc-9.4.4 (#3591)
* ghc-9.4.5 * Bump setup action
1 parent 7700988 commit 941fdb7

File tree

6 files changed

+36
-35
lines changed

6 files changed

+36
-35
lines changed

‎.github/actions/setup-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
sudo chown -R $USER /usr/local/.ghcup
3232
shell: bash
3333

34-
- uses: haskell/actions/setup@v2.3.6
34+
- uses: haskell/actions/setup@v2.4.0
3535
id: HaskEnvSetup
3636
with:
3737
ghc-version : ${{ inputs.ghc }}

‎.github/scripts/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ env
5454

5555
# ensure ghcup
5656
install_ghcup
57-
ghcup install ghc --set 9.4.4
57+
ghcup install ghc --set 9.4.5
5858

5959
(cd .. && ecabal update) # run cabal update outside project dir
6060

‎.github/workflows/release.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
28+
ghc: ["9.6.1", "9.4.5", "9.2.7", "9.0.2", "8.10.7"]
2929
platform: [ { image: "debian:9"
3030
, installCmd: "apt-get update && apt-get install -y"
3131
, toolRequirements: "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"
@@ -105,15 +105,15 @@ jobs:
105105
}
106106
]
107107
# TODO: rm
108-
# we need a different image for 9.4.4, because GHC bindists are busted
108+
# we need a different image for 9.4.5, because GHC bindists are busted
109109
include:
110110
- ghc: 8.10.7
111111
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "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", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
112112
- ghc: 9.0.2
113113
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "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", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
114114
- ghc: 9.2.7
115115
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "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", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
116-
- ghc: 9.4.4
116+
- ghc: 9.4.5
117117
platform: { image: "fedora:33", installCmd: "dnf install -y", toolRequirements: "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 tree", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
118118
- ghc: 9.6.1
119119
platform: { image: "rockylinux:8", installCmd: "yum -y install epel-release && yum install -y --allowerasing", toolRequirements: "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", DISTRO: "Unknown", ARTIFACT: "x86_64-linux-unknown", ADD_CABAL_ARGS: "--enable-split-sections" }
@@ -171,7 +171,7 @@ jobs:
171171
strategy:
172172
fail-fast: true
173173
matrix:
174-
ghc: ["9.6.1","9.4.4", "9.2.7", "9.0.2", "8.10.7"]
174+
ghc: ["9.6.1","9.4.5", "9.2.7", "9.0.2", "8.10.7"]
175175
steps:
176176
- uses: docker://arm64v8/ubuntu:focal
177177
name: Cleanup (aarch64 linux)
@@ -226,7 +226,7 @@ jobs:
226226
strategy:
227227
fail-fast: false
228228
matrix:
229-
ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
229+
ghc: ["9.6.1", "9.4.5", "9.2.7", "9.0.2", "8.10.7"]
230230
steps:
231231
- name: Checkout code
232232
uses: actions/checkout@v3
@@ -266,7 +266,7 @@ jobs:
266266
strategy:
267267
fail-fast: false
268268
matrix:
269-
ghc: ["9.6.1", "9.4.4", "9.2.7", "8.10.7"]
269+
ghc: ["9.6.1", "9.4.5", "9.2.7", "8.10.7"]
270270
steps:
271271
- name: Checkout code
272272
uses: actions/checkout@v3
@@ -315,7 +315,7 @@ jobs:
315315
strategy:
316316
fail-fast: false
317317
matrix:
318-
ghc: ["9.6.1", "9.4.4", "9.2.7", "9.0.2", "8.10.7"]
318+
ghc: ["9.6.1", "9.4.5", "9.2.7", "9.0.2", "8.10.7"]
319319
steps:
320320
- name: install windows deps
321321
shell: pwsh

‎.github/workflows/supported-ghc-versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[ "9.6.1", "9.4.4" , "9.2.7" , "9.0.2" , "8.10.7" ]
1+
[ "9.6.1", "9.4.5" , "9.2.7" , "9.0.2" , "8.10.7" ]

‎.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
name: Test hls-eval-plugin
155155
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS"
156156

157-
- if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
157+
- if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.5' && matrix.ghc != '9.6.1'
158158
name: Test hls-haddock-comments-plugin
159159
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
160160

@@ -174,7 +174,7 @@ jobs:
174174
name: Test hls-fourmolu-plugin
175175
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
176176

177-
- if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
177+
- if: matrix.test && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.5' && matrix.ghc != '9.6.1'
178178
name: Test hls-tactics-plugin test suite
179179
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
180180

@@ -198,7 +198,7 @@ jobs:
198198
name: Test hls-hlint-plugin test suite
199199
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
200200

201-
- if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.4' && matrix.ghc != '9.6.1'
201+
- if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.7' && matrix.ghc != '9.4.5' && matrix.ghc != '9.6.1'
202202
name: Test hls-stan-plugin test suite
203203
run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-stan-plugin --test-options="$TEST_OPTS"
204204

‎docs/support/ghc-version-support.md

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,29 @@ Support status (see the support policy below for more details):
1515
- "full support": this GHC version is currently actively supported, and most [tier 2 plugins](./plugin-support.md) work
1616
- "deprecated": this GHC version was supported in the past, but is now deprecated
1717

18-
| GHC version | Last supporting HLS version | Support status |
19-
|--------------|------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
20-
| 9.6.1 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
21-
| 9.4.4 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
22-
| 9.4.3 | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated |
23-
| 9.4.(1,2) | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
24-
| 9.2.7 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
25-
| 9.2.(5,6) | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated |
26-
| 9.2.(3,4) | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
27-
| 9.2.(1,2) | [1.7.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0) | deprecated |
28-
| 9.0.2 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
29-
| 9.0.1 | [1.6.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.6.1.0) | deprecated |
30-
| 8.10.7 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
31-
| 8.10.6 | [1.6.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.6.1.0) | deprecated |
32-
| 8.10.5 | [1.5.1](https://github.com/haskell/haskell-language-server/releases/tag/1.5.1) | deprecated |
33-
| 8.10.(4,3,2) | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |
34-
| 8.10.1 | [0.9.0](https://github.com/haskell/haskell-language-server/releases/tag/0.9.0) | deprecated |
35-
| 8.8.4 | [1.8.0](https://github.com/haskell/haskell-language-server/releases/1.8.0) | deprecated |
36-
| 8.8.3 | [1.5.1](https://github.com/haskell/haskell-language-server/releases/1.5.1) | deprecated |
37-
| 8.8.2 | [1.2.0](https://github.com/haskell/haskell-language-server/releases/tag/1.2.0) | deprecated |
38-
| 8.6.5 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
39-
| 8.6.4 | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |
18+
| GHC version | Last supporting HLS version | Support status |
19+
|--------------|--------------------------------------------------------------------------------------|-----------------------------------------------------------------------------|
20+
| 9.6.1 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | basic support |
21+
| 9.4.5 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
22+
| 9.4.4 | [1.10.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.10.0.0) | deprecated |
23+
| 9.4.3 | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated |
24+
| 9.4.(1,2) | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
25+
| 9.2.7 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
26+
| 9.2.(5,6) | [1.9.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.9.1.0) | deprecated |
27+
| 9.2.(3,4) | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
28+
| 9.2.(1,2) | [1.7.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0) | deprecated |
29+
| 9.0.2 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
30+
| 9.0.1 | [1.6.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.6.1.0) | deprecated |
31+
| 8.10.7 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | full support |
32+
| 8.10.6 | [1.6.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.6.1.0) | deprecated |
33+
| 8.10.5 | [1.5.1](https://github.com/haskell/haskell-language-server/releases/tag/1.5.1) | deprecated |
34+
| 8.10.(4,3,2) | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |
35+
| 8.10.1 | [0.9.0](https://github.com/haskell/haskell-language-server/releases/tag/0.9.0) | deprecated |
36+
| 8.8.4 | [1.8.0](https://github.com/haskell/haskell-language-server/releases/1.8.0) | deprecated |
37+
| 8.8.3 | [1.5.1](https://github.com/haskell/haskell-language-server/releases/1.5.1) | deprecated |
38+
| 8.8.2 | [1.2.0](https://github.com/haskell/haskell-language-server/releases/tag/1.2.0) | deprecated |
39+
| 8.6.5 | [1.8.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.8.0.0) | deprecated |
40+
| 8.6.4 | [1.4.0](https://github.com/haskell/haskell-language-server/releases/tag/1.4.0) | deprecated |
4041

4142

4243
GHC versions not in the list have never been supported by HLS.

0 commit comments

Comments
 (0)