diff --git a/.circleci/config.yml b/.circleci/config.yml index 84413d48717..72838cfa1c0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,11 +88,6 @@ jobs: - STACK_FILE: "stack-8.8.4.yaml" <<: *defaults - ghc-8.10.2: - environment: - - STACK_FILE: "stack-8.10.2.yaml" - <<: *defaults - ghc-8.10.3: environment: - STACK_FILE: "stack-8.10.3.yaml" @@ -128,7 +123,6 @@ workflows: - ghc-8.8.2 - ghc-8.8.3 - ghc-8.8.4 - - ghc-8.10.2 - ghc-8.10.3 - ghc-8.10.4 - ghc-8.10.5 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b672d1a030..2ec569fe95b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,20 +16,15 @@ 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.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] os: [ubuntu-18.04, macOS-latest, windows-latest] exclude: - - os: windows-latest - ghc: '8.10.2' # broken due to https://gitlab.haskell.org/ghc/ghc/-/issues/18550 - os: windows-latest 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 steps: - uses: actions/checkout@v2 @@ -54,7 +49,6 @@ jobs: GHC_VER: ${{ matrix.ghc }} run: | echo "EXE_EXT=.exe" >> $GITHUB_ENV - GHC_VER=$(echo $GHC_VER | sed 's/8.10.2.2/8.10.2/g') echo "GHC_VERSION=$GHC_VER" >> $GITHUB_ENV - name: Set some linux specific things @@ -81,7 +75,6 @@ jobs: - name: Compress Server Binary id: compress_server_binary run: | - # We normalize windows+choco ghc version 8.10.2.2 HLS_BUILD=$(find dist-newstyle \( -name 'hls' -o -name 'hls.exe' \) -type f) HLS=haskell-language-server-${{env.GHC_VERSION}} mv $HLS_BUILD $HLS${{env.EXE_EXT}} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index abc41c51ca9..7b45a6df92f 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.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"] os: [ubuntu-latest, macOS-latest] include: # only test supported ghc major versions @@ -57,8 +57,6 @@ jobs: - os: windows-latest ghc: '8.10.5' test: true - - os: windows-latest - ghc: '8.10.2.2' - os: windows-latest ghc: '8.10.3' # This build get stuck frequently diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 20aedb7f925..58bc3e3c370 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.2 || == 8.8.3 || == 8.8.4 || == 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 50424693ac9..94717833d5f 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.2 || == 8.8.3 || == 8.8.4 || == 8.10.3 || == 8.10.4 || == 8.10.5 extra-source-files: README.md ChangeLog.md diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml deleted file mode 100644 index 7475853df99..00000000000 --- a/stack-8.10.2.yaml +++ /dev/null @@ -1,89 +0,0 @@ -resolver: nightly-2020-12-09 - -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: - - 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.4 - - fourmolu-0.3.0.0 - - ghc-api-compat-8.6 - - ghc-check-0.5.0.4 - - ghc-exactprint-0.6.4 - - ghc-lib-8.10.4.20210206 - - ghc-lib-parser-8.10.4.20210206 - - lsp-1.2.0.0 - - lsp-types-1.2.0.0 - - lsp-test-0.14.0.0 - - heapsize-0.3.0 - - hie-bios-0.7.5 - - implicit-hie-cradle-0.3.0.2 - - implicit-hie-0.1.2.5 - - monad-dijkstra-0.1.1.2 - - refinery-0.3.0.0 - - retrie-0.1.1.1 - - shake-0.19.4 - - 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.3.0.1 - - 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