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

Enable support for 9.4 on windows #3132

Merged
merged 8 commits into from
Sep 2, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ jobs:
- os: ubuntu-latest
ghc: '8.6.5'
test: true
- os: windows-latest
ghc: '9.4.2'
test: true
- os: windows-latest
ghc: '9.2.4'
test: true
Expand Down
29 changes: 27 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,13 @@ package *

write-ghc-environment-files: never

index-state: 2022-08-15T06:53:13Z
index-state: 2022-08-29T06:53:13Z

constraints:
-- For GHC 9.4, older versions of entropy fail to build on Windows
entropy >= 0.4.1.10,
-- For GHC 9.4
basement >= 0.0.15,
hyphenation +embed,
-- remove this when hlint sets ghc-lib to true by default
-- https://github.com/ndmitchell/hlint/issues/1376
Expand Down Expand Up @@ -86,8 +90,29 @@ source-repository-package
-- https://github.com/haskell/lsp/pull/450

allow-newer:
base, ghc-prim, ghc-bignum, ghc, Cabal, binary, bytestring, unix, time, template-haskell,
-- ghc-9.4
Chart-diagrams:lens,
Chart:lens,
co-log-core:base,
constraints-extras:base,
constraints-extras:template-haskell,
dependent-sum:some,
diagrams-contrib:base,
diagrams-contrib:lens,
diagrams-postscript:base,
diagrams-postscript:lens,
diagrams-svg:base,
diagrams-svg:lens,
ekg-json:base,
ghc-paths:Cabal,
haddock-library:base,
hie-bios:aeson,
hie-bios:ghc,
monoid-extras:base,
monoid-subclasses:vector,
svg-builder:base,
uuid:time,
vector-space:base,

-- ghc-9.2
----------
Expand Down
39 changes: 1 addition & 38 deletions ghcide/ghcide.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ test-suite ghcide-tests
ghc,
--------------------------------------------------------------
ghcide,
ghcide-test-utils-internal,
lsp,
lsp-types,
hls-plugin-api,
Expand Down Expand Up @@ -379,50 +378,14 @@ test-suite ghcide-tests
record-hasfield
if impl(ghc < 9.3)
build-depends: ghc-typelits-knownnat
hs-source-dirs: test/cabal test/exe bench/lib
hs-source-dirs: test/cabal test/exe test/src bench/lib
ghc-options: -threaded -Wall -Wno-name-shadowing -O0 -Wno-unticked-promoted-constructors
main-is: Main.hs
other-modules:
Development.IDE.Test.Runfiles
FuzzySearch
Progress
HieDbRetry
default-extensions:
BangPatterns
DeriveFunctor
DeriveGeneric
FlexibleContexts
GeneralizedNewtypeDeriving
LambdaCase
NamedFieldPuns
OverloadedStrings
RecordWildCards
ScopedTypeVariables
StandaloneDeriving
TupleSections
TypeApplications
ViewPatterns

library ghcide-test-utils-internal
default-language: Haskell2010
build-depends:
aeson,
base,
containers,
data-default,
directory,
extra,
filepath,
ghcide,
lsp-types,
hls-plugin-api,
lens,
lsp-test ^>= 0.14,
tasty-hunit >= 0.10,
text,
hs-source-dirs: test/src
ghc-options: -Wunused-packages
exposed-modules:
Development.IDE.Test
Development.IDE.Test.Diagnostic
default-extensions:
Expand Down
2 changes: 1 addition & 1 deletion ghcide/test/exe/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -2002,7 +2002,7 @@ completionDocTests =
]
where
brokenForGhc9 = knownBrokenFor (BrokenForGHC [GHC90, GHC92, GHC94]) "Completion doc doesn't support ghc9"
brokenForWinGhc9 = knownBrokenFor (BrokenSpecific Windows [GHC90, GHC92, GHC94]) "Extern doc doesn't support Windows for ghc9.2"
brokenForWinGhc9 = knownBrokenFor (BrokenSpecific Windows [GHC90, GHC92]) "Extern doc doesn't support Windows for ghc9.2"
-- https://gitlab.haskell.org/ghc/ghc/-/issues/20903
brokenForMacGhc9 = knownBrokenFor (BrokenSpecific MacOS [GHC90, GHC92, GHC94]) "Extern doc doesn't support MacOS for ghc9"
test doc pos label mn expected = do
Expand Down
2 changes: 1 addition & 1 deletion hie-compat/hie-compat.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ flag ghc-lib
library
default-language: Haskell2010
build-depends:
base < 4.17, array, bytestring, containers, directory, filepath, transformers
base < 4.18, array, bytestring, containers, directory, filepath, transformers
if flag(ghc-lib) && impl(ghc < 9)
build-depends: ghc-lib < 9.0
else
Expand Down