From 3033d62bbe97992431c6cf7ae1ff152a08ddf521 Mon Sep 17 00:00:00 2001 From: Junyoung/Clare Jang Date: Wed, 9 Jun 2021 17:41:44 -0400 Subject: [PATCH] Revert "Remove GHC 8.10.2" This reverts commit b85b02903b797e63a57179ba49c02fe204e2aab6. --- .circleci/config.yml | 6 +++ .github/workflows/build.yml | 9 +++- .github/workflows/test.yml | 4 +- ghcide/ghcide.cabal | 2 +- haskell-language-server.cabal | 2 +- stack-8.10.2.yaml | 91 +++++++++++++++++++++++++++++++++++ 6 files changed, 110 insertions(+), 4 deletions(-) create mode 100644 stack-8.10.2.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 72838cfa1c0..84413d48717 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -88,6 +88,11 @@ 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" @@ -123,6 +128,7 @@ 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 a5b5d775e23..ae64e4907b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,11 @@ jobs: strategy: fail-fast: false matrix: - 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'] + 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'] 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 @@ -27,6 +29,9 @@ jobs: ghc: '8.8.2' # fails due to error with Cabal - os: macOS-latest ghc: '8.10.5' # https://gitlab.haskell.org/ghc/ghc/-/issues/19968 + include: + - os: windows-latest + ghc: '8.10.2.2' # only available for windows and choco steps: - uses: actions/checkout@v2 @@ -51,6 +56,7 @@ 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 @@ -77,6 +83,7 @@ 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 f9e46423e10..96371808005 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.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.8.2", "8.6.5", "8.6.4"] os: [ubuntu-latest, macOS-latest] include: # only test supported ghc major versions @@ -58,6 +58,8 @@ jobs: ghc: '8.10.4' - os: windows-latest ghc: '8.10.3' + - os: windows-latest + ghc: '8.10.2.2' - os: windows-latest ghc: '8.6.5' test: true diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 58bc3e3c370..20aedb7f925 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.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.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 94717833d5f..50424693ac9 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.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.2 || == 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 new file mode 100644 index 00000000000..ce833e756ac --- /dev/null +++ b/stack-8.10.2.yaml @@ -0,0 +1,91 @@ +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 + github: hsyl20/ghc-api-compat + commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15 + - 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