Skip to content

Add support for ghc-8.10.4 and drop it for ghc-8.10.1 #1331

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Feb 10, 2021
Merged

Add support for ghc-8.10.4 and drop it for ghc-8.10.1 #1331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
81c954f
Delete unused azure ci config
jneira Feb 8, 2021
de907b3
Update hackage index to 2021-02-08T19:11:03Z
jneira Feb 8, 2021
acc73f5
Update 8.10.3 resolver and use it for 8.10.4
jneira Feb 8, 2021
3eea094
Use last 8.8.4 lts resolver
jneira Feb 8, 2021
013a98a
Drop 8.10.1: stack.yaml
jneira Feb 8, 2021
5a6d584
Add 8.10.4 and remove 8.10.1 from ci
jneira Feb 8, 2021
772596e
Add 8.10.4 and remove 8.10.1 from .cabal files
jneira Feb 8, 2021
6030e86
Add 8.10.4 and remove 8.10.1 from nix
jneira Feb 8, 2021
6a732b5
Drop specific skipping for ghc-8.10.1
jneira Feb 8, 2021
2526b89
Replace 8.10.1 with 8.10.4 in wrapper test
jneira Feb 9, 2021
2d956cd
Add ghc-8.10.3 windows build
jneira Feb 9, 2021
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,6 @@ jobs:
- STACK_FILE: "stack-8.8.4.yaml"
<<: *defaults

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

ghc-8.10.2:
environment:
- STACK_FILE: "stack-8.10.2.yaml"
Expand All @@ -111,6 +106,11 @@ jobs:
- STACK_FILE: "stack-8.10.3.yaml"
<<: *defaults

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

ghc-default:
environment:
- STACK_FILE: "stack.yaml"
Expand All @@ -126,7 +126,7 @@ workflows:
- ghc-8.8.2
- ghc-8.8.3
- ghc-8.8.4
- ghc-8.10.1
- ghc-8.10.2
- ghc-8.10.3
- ghc-8.10.4
- ghc-default
14 changes: 7 additions & 7 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ pull_request_rules:
method: squash
name: Automatically merge pull requests
conditions:
- status-success=bench-example (8.10.3, ubuntu-latest, Cabal-3.0.0.0)
- status-success=bench-example (8.10.3, ubuntu-latest, lsp-types-1.0.0.1)
- status-success=bench-example (8.10.4, ubuntu-latest, Cabal-3.0.0.0)
- status-success=bench-example (8.10.4, ubuntu-latest, lsp-types-1.0.0.1)

- status-success=nix (default, ubuntu-latest)
- status-success=nix (default, macOS-latest)

- status-success=test (8.10.4, ubuntu-latest)
- status-success=test (8.10.4, macOS-latest)
- status-success=test (8.10.3, ubuntu-latest)
- status-success=test (8.10.3, macOS-latest)
- status-success=test (8.10.2, ubuntu-latest)
- status-success=test (8.10.2, macOS-latest)
- status-success=test (8.10.1, ubuntu-latest)
- status-success=test (8.10.1, macOS-latest)
- status-success=test (8.8.4, ubuntu-latest)
- status-success=test (8.8.4, macOS-latest)
- status-success=test (8.8.3, ubuntu-latest)
Expand All @@ -27,15 +27,15 @@ pull_request_rules:
- status-success=test (8.6.5, macOS-latest)
- status-success=test (8.6.4, ubuntu-latest)
- status-success=test (8.6.4, macOS-latest)
- status-success=test (windows-latest, 8.10.3, true)
- status-success=test (windows-latest, 8.10.4, true)
- status-success=test (windows-latest, 8.10.3)
- status-success=test (windows-latest, 8.6.5, true)
- status-success=test (windows-latest, 8.10.2.2)
- status-success=test (windows-latest, 8.10.1)
# - status-success=test (windows-latest, 8.6.4)

- 'status-success=ci/circleci: ghc-8.10.4'
- 'status-success=ci/circleci: ghc-8.10.3'
- 'status-success=ci/circleci: ghc-8.10.2'
- 'status-success=ci/circleci: ghc-8.10.1'
- 'status-success=ci/circleci: ghc-8.8.4'
- 'status-success=ci/circleci: ghc-8.8.3'
- 'status-success=ci/circleci: ghc-8.8.2'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bench.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.10.3']
ghc: ['8.10.4']
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.10.3']
ghc: ['8.10.4']
os: [ubuntu-latest]
example: ['Cabal-3.0.0.0', 'lsp-types-1.0.0.1']

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['8.10.3', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
ghc: ['8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4']
os: [ubuntu-latest, macOS-latest, windows-latest]
exclude:
- os: windows-latest
Expand Down Expand Up @@ -113,11 +113,11 @@ jobs:
path: ${{ steps.compress_server_binary.outputs.path }}

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

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

- name: Upload Wrapper
if: matrix.ghc == '8.10.1'
if: matrix.ghc == '8.10.4'
uses: actions/upload-release-asset@v1.0.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -147,7 +147,7 @@ jobs:
asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}}

- uses: actions/upload-artifact@v2
if: matrix.ghc == '8.10.1'
if: matrix.ghc == '8.10.4'
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
13 changes: 4 additions & 9 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,15 @@ jobs:
strategy:
fail-fast: true
matrix:
ghc: ["8.10.3", "8.10.2", "8.10.1", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
ghc: ["8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"]
os: [ubuntu-latest, macOS-latest]
include:
# one ghc-lib build
# should be renabled: #784
# - os: ubuntu-latest
# ghc: '8.10.1'
# ghc-lib: true
# only test supported ghc major versions
- os: ubuntu-latest
ghc: '8.10.3'
ghc: '8.10.4'
test: true
- os: windows-latest
ghc: '8.10.3'
ghc: '8.10.4'
test: true
- os: ubuntu-latest
ghc: '8.8.4'
Expand All @@ -39,7 +34,7 @@ jobs:
- os: windows-latest
ghc: '8.10.2.2'
- os: windows-latest
ghc: '8.10.1'
ghc: '8.10.3'
# This build get stuck frequently
# - os: windows-latest
# ghc: '8.6.4'
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ package ghcide

write-ghc-environment-files: never

index-state: 2021-02-03T00:50:21Z
index-state: 2021-02-08T19:11:03Z

allow-newer:
active:base,
Expand Down
39 changes: 0 additions & 39 deletions ghcide/.azure/linux-stack.yml
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions ghcide/.azure/windows-stack.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ghcide/ghcide.cabal
View file
Open in desktop
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/ghcide#readme
bug-reports: https://github.com/haskell/ghcide/issues
tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.1 || == 8.10.2 || == 8.10.3
tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4
extra-source-files: include/ghc-api-version.h README.md CHANGELOG.md
test/data/hover/*.hs
test/data/multi/cabal.project
Expand Down
7 changes: 0 additions & 7 deletions ghcide/test/exe/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3148,7 +3148,6 @@ checkFileCompiles fp diag =

pluginSimpleTests :: TestTree
pluginSimpleTests =
ignoreTest8101 "GHC #18070" $
ignoreInWindowsForGHC88And810 $
testSessionWithExtraFiles "plugin" "simple plugin" $ \dir -> do
_ <- openDoc (dir </> "KnownNat.hs") "haskell"
Expand All @@ -3163,7 +3162,6 @@ pluginSimpleTests =

pluginParsedResultTests :: TestTree
pluginParsedResultTests =
ignoreTest8101 "GHC #18070" $
ignoreInWindowsForGHC88And810 $
testSessionWithExtraFiles "plugin" "parsedResultAction plugin" $ \dir -> do
_ <- openDoc (dir</> "RecordDot.hs") "haskell"
Expand Down Expand Up @@ -4026,11 +4024,6 @@ pattern R x y x' y' = Range (Position x y) (Position x' y')
xfail :: TestTree -> String -> TestTree
xfail = flip expectFailBecause

ignoreTest8101 :: String -> TestTree -> TestTree
ignoreTest8101
| GHC_API_VERSION == ("8.10.1" :: String) = ignoreTestBecause
| otherwise = const id

ignoreInWindowsBecause :: String -> TestTree -> TestTree
ignoreInWindowsBecause = if isWindows then ignoreTestBecause else (\_ x -> x)

Expand Down
2 changes: 1 addition & 1 deletion haskell-language-server.cabal
View file
Open in desktop
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.2 || == 8.8.3 || == 8.8.4 || == 8.10.1 || == 8.10.2 || == 8.10.3
tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4
extra-source-files:
README.md
ChangeLog.md
Expand Down
2 changes: 1 addition & 1 deletion nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ let
ourHaskell = pkgs.haskell // {
packages = pkgs.haskell.packages // {
# relax upper bounds on ghc 8.10.x versions (and skip running tests)
ghc8101 = extended (pkgs.haskell.packages.ghc8101.override sharedOverrides);
ghc8102 = extended (pkgs.haskell.packages.ghc8102.override sharedOverrides);
ghc8103 = extended (pkgs.haskell.packages.ghc8103.override sharedOverrides);
ghc8104 = extended (pkgs.haskell.packages.ghc8104.override sharedOverrides);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure it this will work out of the box

};
};
};
Expand Down
4 changes: 1 addition & 3 deletions stack-8.10.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2021-01-17
resolver: nightly-2021-02-06

packages:
- .
Expand All @@ -19,14 +19,12 @@ ghc-options:
"$everything": -haddock

extra-deps:
- apply-refact-0.9.0.0
- brittany-0.13.1.0
- Cabal-3.0.2.0
- clock-0.7.2
- data-tree-print-0.1.0.2@rev:2
- floskell-0.10.4
- fourmolu-0.3.0.0
- ghc-exactprint-0.6.3.4
- heapsize-0.3.0
- implicit-hie-cradle-0.3.0.2
- implicit-hie-0.1.2.5
Expand Down
Loading