From 6631ba61ebd09bd3c79ce44ce6e9e886ff826183 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 17 Jun 2021 06:24:12 +0200 Subject: [PATCH] Remove ghc-8.8.2 support --- .circleci/config.yml | 6 -- .github/workflows/build.yml | 4 +- .github/workflows/test.yml | 2 +- ghcide/ghcide.cabal | 2 +- haskell-language-server.cabal | 2 +- install/src/Env.hs | 2 - install/src/HlsInstall.hs | 2 - stack-8.8.2.yaml | 114 ---------------------------------- 8 files changed, 4 insertions(+), 130 deletions(-) delete mode 100644 stack-8.8.2.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 16e38ab318..31d0c9120e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -73,11 +73,6 @@ jobs: - STACK_FILE: "stack-8.6.5.yaml" <<: *defaults - ghc-8.8.2: - environment: - - STACK_FILE: "stack-8.8.2.yaml" - <<: *defaults - ghc-8.8.3: environment: - STACK_FILE: "stack-8.8.3.yaml" @@ -125,7 +120,6 @@ workflows: jobs: - ghc-8.6.4 - ghc-8.6.5 - - ghc-8.8.2 - ghc-8.8.3 - ghc-8.8.4 - ghc-8.10.2 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fa99e8789..45533d7eaf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.5', '8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] + ghc: ['8.10.5', '8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.6.5', '8.6.4'] os: [ubuntu-18.04, macOS-latest, windows-latest] exclude: - os: windows-latest @@ -25,8 +25,6 @@ jobs: ghc: '8.8.4' # also fails due to segfault :( - os: windows-latest ghc: '8.8.3' # fails due to segfault - - os: windows-latest - ghc: '8.8.2' # fails due to error with Cabal include: - os: windows-latest ghc: '8.10.2.2' # only available for windows and choco diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2594638f37..63c4a8f7bb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: true matrix: - ghc: ["9.0.1", "8.10.5", "8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"] + ghc: ["9.0.1", "8.10.5", "8.10.4", "8.10.3", "8.10.2", "8.8.4", "8.8.3", "8.6.5", "8.6.4"] os: [ubuntu-latest, macOS-latest] include: # only test supported ghc major versions diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index bd33f46841..7346ce0ebf 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -13,7 +13,7 @@ description: A library for building Haskell IDE's on top of the GHC API. homepage: https://github.com/haskell/haskell-language-server/tree/master/ghcide#readme bug-reports: https://github.com/haskell/haskell-language-server/issues -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 || == 8.10.5 || == 9.0.1 +tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4 || == 8.10.5 || == 9.0.1 extra-source-files: README.md CHANGELOG.md test/data/**/*.project test/data/**/*.cabal diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 3e9cb64f17..7842ef76e1 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -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.2 || == 8.10.3 || == 8.10.4 || == 8.10.5 +tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4 || == 8.10.5 extra-source-files: README.md ChangeLog.md diff --git a/install/src/Env.hs b/install/src/Env.hs index 23eaa2bc9c..357658f509 100644 --- a/install/src/Env.hs +++ b/install/src/Env.hs @@ -108,8 +108,6 @@ getHlsVersions = do & mapMaybe (T.stripPrefix stackYamlPrefix >=> T.stripSuffix stackYamlSuffix) & map T.unpack - -- 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 hlsVersions diff --git a/install/src/HlsInstall.hs b/install/src/HlsInstall.hs index 463b38d0a0..67679ac7f3 100644 --- a/install/src/HlsInstall.hs +++ b/install/src/HlsInstall.hs @@ -70,8 +70,6 @@ defaultMain = do phony "hls" (need ["data", "latest"]) -- stack specific targets - -- Default `stack.yaml` uses ghc-8.8.2 and we can't build hls in windows - -- TODO: Enable for windows when it uses ghc-8.8.3 when isRunFromStack $ phony "dev" $ do need ["show-options"] diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml deleted file mode 100644 index bc4a3441e7..0000000000 --- a/stack-8.8.2.yaml +++ /dev/null @@ -1,114 +0,0 @@ -resolver: lts-15.3 # Last 8.8.2 - -packages: - - . - - ./hie-compat - - ./hls-graph - - ./ghcide/ - - ./hls-plugin-api - - ./hls-test-utils - - ./shake-bench - - ./plugins/hls-class-plugin - - ./plugins/hls-haddock-comments-plugin - - ./plugins/hls-eval-plugin - - ./plugins/hls-explicit-imports-plugin - - ./plugins/hls-refine-imports-plugin - - ./plugins/hls-hlint-plugin - - ./plugins/hls-retrie-plugin - - ./plugins/hls-splice-plugin - - ./plugins/hls-tactics-plugin - - ./plugins/hls-brittany-plugin - - ./plugins/hls-stylish-haskell-plugin - - ./plugins/hls-floskell-plugin - - ./plugins/hls-fourmolu-plugin - - ./plugins/hls-pragmas-plugin - - ./plugins/hls-module-name-plugin - - ./plugins/hls-ormolu-plugin - -ghc-options: - "$everything": -haddock - -extra-deps: - - aeson-1.5.2.0 - - apply-refact-0.9.3.0 - - brittany-0.13.1.2 - - butcher-1.3.3.2 - - bytestring-trie-0.2.5.0 - - clock-0.7.2 - - constrained-dynamic-0.1.0.0 - - floskell-0.10.4 - - fourmolu-0.3.0.0 - - # ghc-api-compat-8.6 - github: hsyl20/ghc-api-compat - commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 - - ghc-check-0.5.0.4 - - ghc-events-0.13.0 - - ghc-exactprint-0.6.4 - - ghc-lib-8.10.4.20210206 - - ghc-lib-parser-8.10.4.20210206 - - ghc-lib-parser-ex-8.10.0.17 - - ghc-trace-events-0.1.2.1 - - haddock-library-1.10.0 - - haskell-src-exts-1.21.1 - - heapsize-0.3.0 - - hie-bios-0.7.4 - - hlint-3.2.3 - - hoogle-5.0.17.11 - - hsimport-0.11.0 - - HsYAML-0.2.1.0@rev:1 - - HsYAML-aeson-0.2.0.0@rev:2 - - ilist-0.3.1.0 - - implicit-hie-cradle-0.3.0.2 - - implicit-hie-0.1.2.5 - - megaparsec-9.0.1 - - monad-dijkstra-0.1.1.2 - - opentelemetry-0.6.1 - - opentelemetry-extra-0.6.1 - - ormolu-0.1.4.1 - - refinery-0.3.0.0 - - retrie-0.1.1.1 - - shake-0.19.4 - - semigroups-0.18.5 - - stylish-haskell-0.12.2.0 - - temporary-1.2.1.1 - - these-1.1.1.1 - - uniplate-1.6.13 - - th-env-0.1.0.2@sha256:d8f1f37f42a8f1a22404d7d0579528af18f5dac7232cca6bdbd5117c115a0ad5,1370 - - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 - - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727 - - hiedb-0.3.0.1 - - sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002 - - direct-sqlite-2.3.26@sha256:04e835402f1508abca383182023e4e2b9b86297b8533afbd4e57d1a5652e0c23,3718 - - extra-1.7.9@sha256:f1dec740f0f2025790c540732bfd52c556ec55bde4f5dfd7cf18e22bd44ff3d0,2683 - - lsp-1.2.0.0 - - lsp-types-1.2.0.0 - - lsp-test-0.14.0.0 - - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657 - - dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068 - - dependent-sum-template-0.1.0.3@sha256:0bbbacdfbd3abf2a15aaf0cf2c27e5bdd159b519441fec39e1e6f2f54424adde,1682 - - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853 - - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055 - - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082 - -configure-options: - ghcide: - - --disable-library-for-ghci - haskell-language-server: - - --disable-library-for-ghci - heapsize: - - --disable-library-for-ghci - -flags: - haskell-language-server: - pedantic: true - retrie: - BuildExecutable: false - # Stack doesn't support automatic flags. - # Until the formatters support ghc-lib-9, we need this flag disabled - hls-hlint-plugin: - hlint33: false - -nix: - packages: [icu libcxx zlib] - -concurrent-tests: false