Merge pull request #1607 from haskell/ghc-8.8.2

Add 8.8.2 stack file and CI
This commit is contained in:
Luke Lau 2020-01-27 21:48:06 +00:00 committed by GitHub
commit 535d4822a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 66 additions and 3 deletions

View File

@ -7,6 +7,8 @@ jobs:
matrix:
stack-def:
YAML_FILE: stack.yaml
stack-8.8.2:
YAML_FILE: stack-8.8.2.yaml
stack-8.8.1:
YAML_FILE: stack-8.8.1.yaml
stack-8.6.5:

View File

@ -7,6 +7,8 @@ jobs:
matrix:
stack-def:
YAML_FILE: stack.yaml
stack-8.8.2:
YAML_FILE: stack-8.8.2.yaml
stack-8.8.1:
YAML_FILE: stack-8.8.1.yaml
stack-8.6.5:

View File

@ -7,6 +7,8 @@ jobs:
matrix:
stack-def:
YAML_FILE: stack.yaml
# ghc versions 8.8.1 and 8.8.2 are not usable in windows
# due to https://gitlab.haskell.org/ghc/ghc/issues/17575
stack-8.6.5:
YAML_FILE: stack-8.6.5.yaml
stack-8.6.4:

View File

@ -126,6 +126,16 @@ jobs:
- STACK_FILE: "stack-8.6.5.yaml"
<<: *defaults
ghc-8.8.1:
environment:
- STACK_FILE: "stack-8.8.1.yaml"
<<: *defaults
ghc-8.8.2:
environment:
- STACK_FILE: "stack-8.8.2.yaml"
<<: *defaults
ghc-nightly:
environment:
- STACK_FILE: "stack.yaml"
@ -171,5 +181,7 @@ workflows:
- ghc-8.4.4
- ghc-8.6.4
- ghc-8.6.5
- ghc-8.8.1
- ghc-8.8.2
- ghc-nightly
- cabal

View File

@ -104,8 +104,8 @@ getHieVersions = do
& mapMaybe
(T.stripPrefix stackYamlPrefix >=> T.stripSuffix stackYamlSuffix)
& map T.unpack
-- the following line excludes `8.6.3` and `8.8.1` on windows systems
& filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3","8.8.1"]))
-- the following line excludes `8.6.3`, `8.8.1` and `8.8.2` on windows systems
& filter (\p -> not (isWindowsSystem && p `elem` ["8.6.3", "8.8.1", "8.8.2"]))
& sort
return hieVersions

43
stack-8.8.2.yaml Normal file
View File

@ -0,0 +1,43 @@
resolver: nightly-2020-01-25
packages:
- .
- hie-plugin-api
extra-deps:
# - ./submodules/HaRe
- apply-refact-0.7.0.0
- bytestring-trie-0.2.5.0
- cabal-helper-1.0.0.0
- clock-0.7.2
- constrained-dynamic-0.1.0.0
- floskell-0.10.2
- ghc-lib-parser-ex-8.8.2
- git: https://github.com/haskell/haddock.git
commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65
subdirs:
- haddock-api
- haddock-library-1.8.0
- haskell-src-exts-1.21.1
- hie-bios-0.3.2
- hlint-2.2.8
- hoogle-5.0.17.11
- hsimport-0.11.0
- ilist-0.3.1.0
- monad-dijkstra-0.1.1.2
- ormolu-0.0.3.1
- semigroups-0.18.5
- temporary-1.2.1.1
flags:
haskell-ide-engine:
pedantic: true
hie-plugin-api:
pedantic: true
# allow-newer: true
nix:
packages: [ icu libcxx zlib ]
concurrent-tests: false

View File

@ -172,7 +172,9 @@ ghcVersion = GHC84
stackYaml :: FilePath
stackYaml =
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,1,0)))
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,2,0)))
"stack-8.8.2.yaml"
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,1,0)))
"stack-8.8.1.yaml"
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,6,5,0)))
"stack-8.6.5.yaml"