mirror of
https://github.com/alexwl/haskell-code-explorer.git
synced 2024-08-17 07:10:30 +03:00
Add support for GHC 8.6.5
This commit is contained in:
parent
4ad872ac71
commit
660e3020f5
@ -66,6 +66,11 @@ jobs:
|
||||
- STACK_FILE: "stack-8.6.4.yaml"
|
||||
<<: *defaults
|
||||
|
||||
ghc-8.6.5:
|
||||
environment:
|
||||
- STACK_FILE: "stack-8.6.5.yaml"
|
||||
<<: *defaults
|
||||
|
||||
workflows:
|
||||
version: 2
|
||||
build_and_test:
|
||||
@ -76,3 +81,4 @@ workflows:
|
||||
- ghc-8.4.4
|
||||
- ghc-8.6.3
|
||||
- ghc-8.6.4
|
||||
- ghc-8.6.5
|
||||
|
10
README.md
10
README.md
@ -48,12 +48,18 @@ cd haskell-code-explorer
|
||||
|
||||
To build Haskell Code Explorer Stack ([https://docs.haskellstack.org/en/stable/README/](https://docs.haskellstack.org/en/stable/README/)) is needed.
|
||||
|
||||
At the moment Haskell Code Explorer supports GHC 8.6.4, GHC 8.6.3, GHC 8.4.4, GHC 8.4.3, GHC 8.2.2, and 8.0.2.
|
||||
At the moment Haskell Code Explorer supports GHC 8.6.5, 8.6.4, GHC 8.6.3, GHC 8.4.4, GHC 8.4.3, GHC 8.2.2, and 8.0.2.
|
||||
|
||||
For GHC 8.6.5:
|
||||
|
||||
```bash
|
||||
stack install
|
||||
```
|
||||
|
||||
For GHC 8.6.4:
|
||||
|
||||
```bash
|
||||
stack install
|
||||
stack --stack-yaml=stack-8.6.4.yaml install
|
||||
```
|
||||
|
||||
For GHC 8.6.3:
|
||||
|
@ -41,7 +41,7 @@ import System.Process.Typed
|
||||
-- | Keep this in sync with the stack.yamls at the top level of the project.
|
||||
supportedGhcVersions :: [Version]
|
||||
supportedGhcVersions =
|
||||
map Version ["8.0.2", "8.2.2", "8.4.3", "8.4.4", "8.6.3", "8.6.4"]
|
||||
map Version ["8.0.2", "8.2.2", "8.4.3", "8.4.4", "8.6.3", "8.6.4","8.6.5"]
|
||||
|
||||
newtype Version = Version { unVersion :: String } deriving Eq
|
||||
|
||||
|
@ -264,7 +264,12 @@ createPackageInfo packageDirectoryPath mbDistDirRelativePath sourceCodePreproces
|
||||
HCE.ComponentId . T.append "bench-" . T.pack $ name
|
||||
chComponentNameToComponentId ChSetupHsName = HCE.ComponentId "setup"
|
||||
|
||||
#if MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)
|
||||
|
||||
|
||||
#if MIN_VERSION_GLASGOW_HASKELL(8,6,5,0)
|
||||
ghcVersion :: Version
|
||||
ghcVersion = Version {versionBranch = [8, 6, 5, 0], versionTags = []}
|
||||
#elif MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)
|
||||
ghcVersion :: Version
|
||||
ghcVersion = Version {versionBranch = [8, 6, 4, 0], versionTags = []}
|
||||
#elif MIN_VERSION_GLASGOW_HASKELL(8,6,3,0)
|
||||
|
8
stack-8.6.5.yaml
Normal file
8
stack-8.6.5.yaml
Normal file
@ -0,0 +1,8 @@
|
||||
resolver: lts-13.20
|
||||
packages:
|
||||
- '.'
|
||||
- location: vendor/cabal-helper-0.8.1.2
|
||||
extra-dep: true
|
||||
allow-newer: true
|
||||
extra-deps:
|
||||
- cabal-plan-0.4.0.0
|
@ -1,4 +1,4 @@
|
||||
resolver: lts-13.12
|
||||
resolver: lts-13.20
|
||||
packages:
|
||||
- '.'
|
||||
- location: vendor/cabal-helper-0.8.1.2
|
||||
|
@ -155,9 +155,11 @@ moduleInfoSpec modInfo =
|
||||
HCE.idOccMap (modInfo :: HCE.ModuleInfo) `shouldBe` testIdOccMap
|
||||
|
||||
stackYamlArg :: [String]
|
||||
#if MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)
|
||||
#if MIN_VERSION_GLASGOW_HASKELL(8,6,5,0)
|
||||
stackYamlArg = []
|
||||
#elif MIN_VERSION_GLASGOW_HASKELL(8,6,1,0)
|
||||
#elif MIN_VERSION_GLASGOW_HASKELL(8,6,4,0)
|
||||
stackYamlArg = ["--stack-yaml=stack-8.6.4.yaml"]
|
||||
#elif MIN_VERSION_GLASGOW_HASKELL(8,6,3,0)
|
||||
stackYamlArg = ["--stack-yaml=stack-8.6.3.yaml"]
|
||||
#elif MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)
|
||||
stackYamlArg = ["--stack-yaml=stack-8.4.4.yaml"]
|
||||
|
1
test/test-package/stack-8.6.4.yaml
Normal file
1
test/test-package/stack-8.6.4.yaml
Normal file
@ -0,0 +1 @@
|
||||
resolver: lts-13.12
|
1
test/test-package/stack-8.6.5.yaml
Normal file
1
test/test-package/stack-8.6.5.yaml
Normal file
@ -0,0 +1 @@
|
||||
resolver: lts-13.20
|
@ -1 +1 @@
|
||||
resolver: lts-13.12
|
||||
resolver: lts-13.20
|
||||
|
Loading…
Reference in New Issue
Block a user