diff options
| -rw-r--r-- | .circleci/config.yml | 6 | ||||
| -rw-r--r-- | README.md | 10 | ||||
| -rwxr-xr-x | install.hs | 2 | ||||
| -rw-r--r-- | src/HaskellCodeExplorer/PackageInfo.hs | 7 | ||||
| -rw-r--r-- | stack-8.6.5.yaml | 8 | ||||
| -rw-r--r-- | stack.yaml | 2 | ||||
| -rw-r--r-- | test/Main.hs | 6 | ||||
| -rw-r--r-- | test/test-package/stack-8.6.4.yaml | 1 | ||||
| -rw-r--r-- | test/test-package/stack-8.6.5.yaml | 1 | ||||
| -rw-r--r-- | test/test-package/stack.yaml | 2 |
10 files changed, 37 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 36f0768..6071275 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,6 +65,11 @@ jobs: environment: - STACK_FILE: "stack-8.6.4.yaml" <<: *defaults + + ghc-8.6.5: + environment: + - STACK_FILE: "stack-8.6.5.yaml" + <<: *defaults workflows: version: 2 @@ -76,3 +81,4 @@ workflows: - ghc-8.4.4 - ghc-8.6.3 - ghc-8.6.4 + - ghc-8.6.5 @@ -48,14 +48,20 @@ 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.4: +For GHC 8.6.5: ```bash stack install ``` +For GHC 8.6.4: + +```bash +stack --stack-yaml=stack-8.6.4.yaml install +``` + For GHC 8.6.3: ```bash @@ -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 diff --git a/src/HaskellCodeExplorer/PackageInfo.hs b/src/HaskellCodeExplorer/PackageInfo.hs index 7019221..91028af 100644 --- a/src/HaskellCodeExplorer/PackageInfo.hs +++ b/src/HaskellCodeExplorer/PackageInfo.hs @@ -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) diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml new file mode 100644 index 0000000..5944fc2 --- /dev/null +++ b/stack-8.6.5.yaml @@ -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 diff --git a/test/Main.hs b/test/Main.hs index e4bd4f0..13bbe29 100644 --- a/test/Main.hs +++ b/test/Main.hs @@ -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"] diff --git a/test/test-package/stack-8.6.4.yaml b/test/test-package/stack-8.6.4.yaml new file mode 100644 index 0000000..88f5e2c --- /dev/null +++ b/test/test-package/stack-8.6.4.yaml @@ -0,0 +1 @@ +resolver: lts-13.12 diff --git a/test/test-package/stack-8.6.5.yaml b/test/test-package/stack-8.6.5.yaml new file mode 100644 index 0000000..f9ebe57 --- /dev/null +++ b/test/test-package/stack-8.6.5.yaml @@ -0,0 +1 @@ +resolver: lts-13.20 diff --git a/test/test-package/stack.yaml b/test/test-package/stack.yaml index 88f5e2c..f9ebe57 100644 --- a/test/test-package/stack.yaml +++ b/test/test-package/stack.yaml @@ -1 +1 @@ -resolver: lts-13.12 +resolver: lts-13.20 |