Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop ghc support for 8.6.4, 8.10.2, 8.10.3, 8.10.4 #2197

Merged
merged 12 commits into from
Sep 17, 2021
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ defaults: &defaults

version: 2
jobs:
ghc-8.6.4:
environment:
- STACK_FILE: "stack-8.6.4.yaml"
<<: *defaults

ghc-8.6.5:
environment:
- STACK_FILE: "stack-8.6.5.yaml"
Expand All @@ -66,21 +61,6 @@ jobs:
- STACK_FILE: "stack-8.8.4.yaml"
<<: *defaults

ghc-8.10.2:
environment:
- STACK_FILE: "stack-8.10.2.yaml"
<<: *defaults

ghc-8.10.3:
environment:
- STACK_FILE: "stack-8.10.3.yaml"
<<: *defaults

ghc-8.10.4:
environment:
- STACK_FILE: "stack-8.10.4.yaml"
<<: *defaults

ghc-8.10.5:
environment:
- STACK_FILE: "stack-8.10.5.yaml"
Expand Down Expand Up @@ -111,13 +91,9 @@ workflows:
version: 2
multiple-ghcs:
jobs:
- ghc-8.6.4
- ghc-8.6.5
- ghc-8.8.3
- ghc-8.8.4
- ghc-8.10.2
- ghc-8.10.3
- ghc-8.10.4
- ghc-8.10.5
- ghc-8.10.6
- ghc-8.10.7
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.10.4']
ghc: ['8.10.7']
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.10.4']
ghc: ['8.10.7']
os: [ubuntu-latest]
example: ['cabal', 'lsp-types']

Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,13 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.10.5', '8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.6.5', '8.6.4']
ghc: ['9.0.1', '8.10.7', '8.10.6', '8.10.5', '8.8.4', '8.8.3', '8.6.5']
os: [ubuntu-18.04, macOS-latest, windows-latest]
exclude:
- os: windows-latest
ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550
- os: windows-latest
ghc: '8.8.4' # also fails due to segfault :(
- os: windows-latest
ghc: '8.8.3' # fails due to segfault
include:
- os: windows-latest
ghc: '8.10.2.2' # only available for windows and choco

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -56,8 +51,6 @@ jobs:
GHC_VER: ${{ matrix.ghc }}
run: |
echo "EXE_EXT=.exe" >> $GITHUB_ENV
# We normalize windows+choco ghc version 8.10.2.2
GHC_VER=$(echo $GHC_VER | sed 's/8.10.2.2/8.10.2/g')
echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV

- name: Set some linux specific things
Expand Down Expand Up @@ -121,11 +114,11 @@ jobs:
path: ${{ steps.compress_server_binary.outputs.path }}

- name: Build Wrapper
if: matrix.ghc == '8.10.4'
if: matrix.ghc == '8.10.7'
run: cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS

- name: Compress Wrapper Binary
if: matrix.ghc == '8.10.4'
if: matrix.ghc == '8.10.7'
id: compress_wrapper_binary
run: |
HLS_WRAPPER_BUILD=$(find dist-newstyle \( -name 'hls-wrapper' -o -name 'hls-wrapper.exe' \) -type f)
Expand All @@ -144,7 +137,7 @@ jobs:
fi

- name: Upload Wrapper
if: matrix.ghc == '8.10.4'
if: matrix.ghc == '8.10.7'
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -155,7 +148,7 @@ jobs:
asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}

- uses: actions/upload-artifact@v2
if: matrix.ghc == '8.10.4'
if: matrix.ghc == '8.10.7'
with:
name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }}
path: ${{ steps.compress_wrapper_binary.outputs.path }}
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: true
matrix:
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.10.5", "8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.6.5", "8.6.4"]
ghc: ["9.0.1", '8.10.7', '8.10.6', "8.10.5", "8.8.4", "8.8.3", "8.6.5"]
os: [ubuntu-latest, macOS-latest]
include:
# only test supported ghc major versions
Expand Down Expand Up @@ -63,16 +63,6 @@ jobs:
ghc: '8.10.6'
- os: windows-latest
ghc: '8.10.5'
- os: windows-latest
ghc: '8.10.4'
- os: windows-latest
ghc: '8.10.3'
# These builds get stuck frequently
# - os: windows-latest
# ghc: '8.10.2.2'

# - os: windows-latest
# ghc: '8.6.4'

steps:
- if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion cabal-ghc901.project
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ source-repository-package

write-ghc-environment-files: never

index-state: 2021-09-06T12:12:22Z
index-state: 2021-09-16T07:00:23Z

constraints:
-- These plugins don't work on GHC9 yet
Expand Down
2 changes: 1 addition & 1 deletion cabal-ghc921.project
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ source-repository-package

write-ghc-environment-files: never

index-state: 2021-08-31T02:21:16Z
index-state: 2021-09-16T07:00:23Z

constraints:
-- These plugins doesn't work on GHC9 yet
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ package *

write-ghc-environment-files: never

index-state: 2021-09-06T12:12:22Z
index-state: 2021-09-16T07:00:23Z

constraints:
hyphenation +embed
Expand Down
4 changes: 2 additions & 2 deletions docs/contributing/contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ If you are using nix 2.4 style command (enabled by `experimental-features = nix-
you can use `nix develop` instead of `nix-shell` to enter the development shell. To enter the shell with specific GHC versions:

* `nix develop` or `nix develop .#haskell-language-server-dev` - default GHC version
* `nix develop .#haskell-language-server-8104-dev` - GHC 8.10.4
* `nix develop .#haskell-language-server-8107-dev` - GHC 8.10.7
* `nix develop .#haskell-language-server-884-dev` - GHC 8.8.4
* `nix develop .#haskell-language-server-901-dev` - GHC 9.0.1

Expand All @@ -59,7 +59,7 @@ If you are looking for a Nix expression to create haskell-language-server binari
To create binaries:

* `nix build` or `nix build .#haskell-language-server` - default GHC version
* `nix build .#haskell-language-server-8104` - GHC 8.10.4
* `nix build .#haskell-language-server-8107` - GHC 8.10.7
* `nix build .#haskell-language-server-884` - GHC 8.8.4
* `nix build .#haskell-language-server-901` - GHC 9.0.1

Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,6 @@ Homebrew users can install `haskell-language-server` using the following command
brew install haskell-language-server
```

This formula contains HLS binaries compiled with GHC versions available via Homebrew; at the moment those are: 8.6.5, 8.8.4, 8.10.4.
This formula contains HLS binaries compiled with GHC versions available via Homebrew; at the moment those are: 8.6.5, 8.8.4, 8.10.7.

You need to provide your own GHC/Cabal/Stack as required by your project, possibly via Homebrew.
145 changes: 0 additions & 145 deletions ghcide/docs/Setup.md

This file was deleted.

2 changes: 1 addition & 1 deletion ghcide/ghcide.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ description:
A library for building Haskell IDE's on top of the GHC API.
homepage: https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme
bug-reports: https://github.com/haskell/haskell-language-server/issues
tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1
tested-with: GHC == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1
extra-source-files: README.md CHANGELOG.md
test/data/**/*.project
test/data/**/*.cabal
Expand Down
2 changes: 1 addition & 1 deletion haskell-language-server.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ copyright: The Haskell IDE Team
license: Apache-2.0
license-file: LICENSE
build-type: Simple
tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4 || == 8.10.5 || == 8.10.6
tested-with: GHC == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.5 || == 8.10.6 || == 8.10.7 || == 9.0.1
extra-source-files:
README.md
ChangeLog.md
Expand Down
2 changes: 1 addition & 1 deletion plugins/hls-hlint-plugin/hls-hlint-plugin.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ library
else
build-depends:
, ghc
, ghc-lib ^>=8.10.4.20210206
, ghc-lib ^>=8.10.7.20210828
, ghc-lib-parser-ex ^>=8.10

cpp-options: -DHLINT_ON_GHC_LIB
Expand Down
Loading