Skip to content

Commit 3b24251

Browse files
jhrcekmichaelpj
authored andcommitted
Cleanup CI configs and cabal files
1 parent cd44ab0 commit 3b24251

File tree

8 files changed

+16
-32
lines changed

8 files changed

+16
-32
lines changed

.github/workflows/caching.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@ jobs:
8989
- ubuntu-latest
9090
- macOS-latest
9191
- windows-latest
92-
exclude:
93-
# We disable this this combo in test.yml due to long path issues, so we also need to disable it here
94-
- os: windows-latest
95-
ghc: "9.2"
9692
steps:
9793
- uses: actions/checkout@v3
9894

@@ -105,7 +101,7 @@ jobs:
105101
# Fetching from github cache is faster than doing it from hackage
106102
# Sources does not change per ghc and ghc version son only doing it
107103
# for one matrix job (it is arbitrary)
108-
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '9.2'
104+
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '9.6'
109105
name: Download sources
110106
run: |
111107
cabal $cabalBuild --only-download --enable-benchmarks --enable-tests
@@ -120,7 +116,7 @@ jobs:
120116
# We build ghcide with benchs and test enabled to include its dependencies in the cache
121117
# (including shake-bench)
122118
# Only for the same ghc and os used in the bench workflow, so we save cache space
123-
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '9.2'
119+
- if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '9.6'
124120
name: Build ghcide benchmark
125121
run: |
126122
cabal $cabalBuild ghcide --enable-benchmarks --enable-tests

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- uses: ./.github/actions/setup-build
2828
with:
2929
# select a stable GHC version
30-
ghc: 9.2
30+
ghc: 9.6
3131
os: ${{ runner.os }}
3232
shorten-hls: false
3333

.github/workflows/release.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,6 @@ jobs:
118118
# Perhaps we can migrate *all* unknown linux builds to a uniform
119119
# image.
120120
include:
121-
- ghc: 9.2.8
122-
platform:
123-
{ image: "rockylinux:8"
124-
, installCmd: "yum -y install epel-release && yum install -y --allowerasing"
125-
, 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"
126-
, DISTRO: "Unknown"
127-
, ARTIFACT: "x86_64-linux-unknown"
128-
, ADD_CABAL_ARGS: "--enable-split-sections"
129-
}
130121
- ghc: 9.4.8
131122
platform:
132123
{ image: "fedora:27"
@@ -222,7 +213,7 @@ jobs:
222213
strategy:
223214
fail-fast: true
224215
matrix:
225-
ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8", "9.2.8" ]
216+
ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8"]
226217
steps:
227218
- uses: docker://arm64v8/ubuntu:focal
228219
name: Cleanup (aarch64 linux)
@@ -282,7 +273,7 @@ jobs:
282273
strategy:
283274
fail-fast: false
284275
matrix:
285-
ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8", "9.2.8"]
276+
ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8"]
286277
steps:
287278
- name: Checkout code
288279
uses: actions/checkout@v3
@@ -327,7 +318,7 @@ jobs:
327318
strategy:
328319
fail-fast: false
329320
matrix:
330-
ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8", "9.2.8"]
321+
ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8"]
331322
steps:
332323
- name: Checkout code
333324
uses: actions/checkout@v3
@@ -372,7 +363,7 @@ jobs:
372363
strategy:
373364
fail-fast: false
374365
matrix:
375-
ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8", "9.2.8"]
366+
ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8"]
376367
steps:
377368
- name: install windows deps
378369
shell: pwsh

.github/workflows/test.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ jobs:
7878
- true
7979
- false
8080
exclude:
81-
# Don't do anything for windows on 9.2, it has particularly bad long-path issues
82-
- os: windows-latest
83-
ghc: "9.2"
8481
# Exclude the test configuration on macos, it's sufficiently similar to other OSs
8582
# that it mostly just burns CI time. Buiding is still useful since it catches
8683
# solver issues.
@@ -164,7 +161,7 @@ jobs:
164161
run: cabal test hls-splice-plugin-tests || cabal test hls-splice-plugin-tests
165162

166163
# TODO enable when it supports 9.10
167-
- if: matrix.test && matrix.ghc != '9.2' && matrix.ghc != '9.10'
164+
- if: matrix.test && matrix.ghc != '9.10'
168165
name: Test hls-stan-plugin
169166
run: cabal test hls-stan-plugin-tests || cabal test hls-stan-plugin-tests
170167

@@ -231,7 +228,7 @@ jobs:
231228
run: cabal test hls-explicit-record-fields-plugin-tests || cabal test hls-explicit-record-fields-plugin-tests
232229

233230
## version needs to be limited since the tests depend on cabal-fmt which only builds using specific ghc versions
234-
- if: matrix.test && matrix.ghc == '9.2'
231+
- if: matrix.test && matrix.ghc == '9.2' # TODO cabal-fmt only worked with 9.2? decide what to do with it
235232
name: Test hls-cabal-fmt-plugin test suite
236233
run: cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests || cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests
237234

docs/troubleshooting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ stack install haskell-language-server
189189
You also can leverage `ghcup compile hls`:
190190

191191
```bash
192-
ghcup compile hls -v 1.9.0.0 --ghc 9.2.5
192+
ghcup compile hls -v 2.9.0.0 --ghc 9.6.5
193193
```
194194

195195
### Preprocessors

ghcide/ghcide.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ homepage:
1414
https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme
1515

1616
bug-reports: https://github.com/haskell/haskell-language-server/issues
17-
tested-with: GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8 || ==9.2.8
17+
tested-with: GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8
1818
extra-source-files:
1919
CHANGELOG.md
2020
README.md

haskell-language-server.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ copyright: The Haskell IDE Team
1414
license: Apache-2.0
1515
license-file: LICENSE
1616
build-type: Simple
17-
tested-with: GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8 || ==9.2.8
17+
tested-with: GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8
1818
extra-source-files:
1919
README.md
2020
ChangeLog.md
@@ -764,13 +764,13 @@ flag stan
764764
manual: True
765765

766766
common stan
767-
if flag(stan) && (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.10.0))
767+
if flag(stan) && impl(ghc < 9.10.0)
768768
build-depends: haskell-language-server:hls-stan-plugin
769769
cpp-options: -Dhls_stan
770770

771771
library hls-stan-plugin
772772
import: defaults, pedantic, warnings
773-
if flag(stan) && (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.10.0))
773+
if flag(stan) && impl(ghc < 9.10.0)
774774
buildable: True
775775
else
776776
buildable: False
@@ -798,7 +798,7 @@ library hls-stan-plugin
798798

799799
test-suite hls-stan-plugin-tests
800800
import: defaults, pedantic, test-defaults, warnings
801-
if flag(stan) && (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.10.0))
801+
if flag(stan) && impl(ghc < 9.10.0)
802802
buildable: True
803803
else
804804
buildable: False
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# specific version does not matter
2-
resolver: ghc-9.2.5
2+
resolver: ghc-9.6.5

0 commit comments

Comments
 (0)