diff --git a/.circleci/config.yml b/.circleci/config.yml index 2a8e5181b1..e05106bf7f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -86,6 +86,11 @@ jobs: - STACK_FILE: "stack-8.10.5.yaml" <<: *defaults + ghc-8.10.6: + environment: + - STACK_FILE: "stack-8.10.6.yaml" + <<: *defaults + ghc-9.0.1: environment: - STACK_FILE: "stack-9.0.1.yaml" @@ -109,5 +114,6 @@ workflows: - ghc-8.10.3 - ghc-8.10.4 - ghc-8.10.5 + - ghc-8.10.6 - ghc-9.0.1 - ghc-default diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9d2845ef9..3707d4c1d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - 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'] + ghc: ['9.0.1', '8.10.6', '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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4ad4d30000..6778b1878e 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.6.5", "8.6.4"] + ghc: ["9.0.1", '8.10.6', "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 @@ -41,7 +41,7 @@ jobs: ghc: '9.0.1' test: true - os: ubuntu-latest - ghc: '8.10.5' + ghc: '8.10.6' test: true - os: ubuntu-latest ghc: '8.8.4' @@ -53,12 +53,14 @@ jobs: ghc: '9.0.1' test: true - os: windows-latest - ghc: '8.10.5' + ghc: '8.10.6' test: true - os: windows-latest ghc: '8.6.5' test: true # only build rest of supported ghc versions for windows + - os: windows-latest + ghc: '8.10.5' - os: windows-latest ghc: '8.10.4' - os: windows-latest diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index debdfc8f0a..d1fcd16e93 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.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 || == 8.10.6 || == 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 0cf7d7d30e..83355be7f4 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.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 || == 8.10.6 extra-source-files: README.md ChangeLog.md diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml index 7f23bb9242..591bb24c58 100644 --- a/stack-8.10.5.yaml +++ b/stack-8.10.5.yaml @@ -33,6 +33,7 @@ ghc-options: "$everything": -haddock extra-deps: + - ansi-terminal-0.10.3 - apply-refact-0.9.3.0 - brittany-0.13.1.2 - Cabal-3.0.2.0 @@ -50,6 +51,8 @@ extra-deps: - implicit-hie-cradle-0.3.0.5 - implicit-hie-0.1.2.6 - monad-dijkstra-0.1.1.2 + # For stylish-haskell-0.12.2.0 + - optparse-applicative-0.15.1.0 - refinery-0.4.0.0 - retrie-0.1.1.1 - stylish-haskell-0.12.2.0 @@ -94,10 +97,6 @@ flags: hyphenation: embed: true - -# Because of implicit-hie-cradle-0.3.0.2 and stylish-haskell-0.12.2.0 -allow-newer: true - nix: packages: [ icu libcxx zlib ] diff --git a/stack-8.10.6.yaml b/stack-8.10.6.yaml new file mode 100644 index 0000000000..3e4d56d2cd --- /dev/null +++ b/stack-8.10.6.yaml @@ -0,0 +1,100 @@ +resolver: nightly-2021-06-14 +compiler: ghc-8.10.6 + +packages: + - . + - ./hie-compat + - ./hls-graph + - ./ghcide/ + - ./hls-plugin-api + - ./hls-test-utils + # - ./shake-bench + - ./plugins/hls-call-hierarchy-plugin + - ./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: + - apply-refact-0.9.3.0 + - brittany-0.13.1.2 + - Cabal-3.0.2.0 + - clock-0.7.2 + - data-tree-print-0.1.0.2@rev:2 + - floskell-0.10.5 + - fourmolu-0.3.0.0 + - # ghc-api-compat-8.6 + github: hsyl20/ghc-api-compat + commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 + - ghc-check-0.5.0.4 + - ghc-exactprint-0.6.4 + - ghc-source-gen-0.4.1.0 + - heapsize-0.3.0 + - implicit-hie-cradle-0.3.0.5 + - implicit-hie-0.1.2.6 + - monad-dijkstra-0.1.1.2 + # For stylish-haskell-0.12.2.0 + - optparse-applicative-0.15.1.0 + - refinery-0.4.0.0 + - retrie-1.0.0.0 + - stylish-haskell-0.12.2.0 + - semigroups-0.18.5 + - temporary-1.2.1.1 + - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854 + - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727 + - hiedb-0.4.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.1.0 + - some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055 + - unliftio-core-0.2.0.1@sha256:9b3e44ea9aacacbfc35b3b54015af450091916ac3618a41868ebf6546977659a,1082 + - lsp-1.2.0.1 + - lsp-types-1.3.0.1 + - lsp-test-0.14.0.1 + + # Enable these when supported by all formatters + # - ghc-lib-9.0.1.20210324@sha256:c8b9a2541ea3424c8d0e4f80584477d0f35be03f4a47d931152042d5f446c5fc,19279 + # - ghc-lib-parser-9.0.1.20210324@sha256:fb680f78d4ab08b5d089a05bda3b84ad857e5edcc2e4ca7c188c0207d369af80 + # - ghc-lib-parser-ex-9.0.0.4@sha256:8282b11c3797fc8ba225b245e736cc9a0745d9c48d0f9fea7f9bffb5c9997709,3642 + # - hlint-3.3@sha256:4218ad6e03050f5d68aeba0e025f5f05e366c8fd49657f2a19df04ee31b2bb23,4154 + +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 + hyphenation: + embed: true + +nix: + packages: [ icu libcxx zlib ] + +concurrent-tests: false