From 81c954fafeb5f637311ca40f755f25b4dd05d511 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 21:52:29 +0100 Subject: [PATCH 01/11] Delete unused azure ci config --- ghcide/.azure/linux-stack.yml | 39 ------------------------------- ghcide/.azure/windows-stack.yml | 41 --------------------------------- 2 files changed, 80 deletions(-) delete mode 100644 ghcide/.azure/linux-stack.yml delete mode 100644 ghcide/.azure/windows-stack.yml diff --git a/ghcide/.azure/linux-stack.yml b/ghcide/.azure/linux-stack.yml deleted file mode 100644 index 1c2a787b04..0000000000 --- a/ghcide/.azure/linux-stack.yml +++ /dev/null @@ -1,39 +0,0 @@ -jobs: -- job: ghcide_stack_linux - timeoutInMinutes: 60 - pool: - vmImage: 'ubuntu-latest' - variables: - STACK_ROOT: $(Pipeline.Workspace)/.stack - steps: - - checkout: self - - task: Cache@2 - inputs: - key: stack-root-cache | $(Agent.OS) | $(Build.SourcesDirectory)/stack.yaml | $(Build.SourcesDirectory)/ghcide.cabal - path: $(STACK_ROOT) - cacheHitVar: STACK_ROOT_CACHE_RESTORED - displayName: "Cache stack root" - - task: Cache@2 - inputs: - key: stack-work-cache | $(Agent.OS) | $(Build.SourcesDirectory)/stack.yaml | $(Build.SourcesDirectory)/ghcide.cabal - path: .stack-work - cacheHitVar: STACK_WORK_CACHE_RESTORED - displayName: "Cache stack work" - - bash: | - ./fmt.sh - displayName: "HLint via ./fmt.sh" - - bash: | - sudo add-apt-repository ppa:hvr/ghc - sudo apt-get update - sudo apt-get install -y g++ gcc libc6-dev libffi-dev libgmp-dev make zlib1g-dev cabal-install-3.2 - if ! which stack >/dev/null 2>&1; then - curl -sSL https://get.haskellstack.org/ | sh - fi - mkdir -p $STACK_ROOT - displayName: 'Install Stack' - - bash: stack setup - displayName: 'stack setup' - - bash: cabal update # some tests use Cabal cradles - displayName: 'cabal update' - - bash: stack build --test --no-run-tests - displayName: 'stack build --test --no-run-tests' diff --git a/ghcide/.azure/windows-stack.yml b/ghcide/.azure/windows-stack.yml deleted file mode 100644 index 21b99fc0d4..0000000000 --- a/ghcide/.azure/windows-stack.yml +++ /dev/null @@ -1,41 +0,0 @@ -jobs: -- job: ghcide_stack_windows - timeoutInMinutes: 120 - pool: - vmImage: 'windows-2019' - variables: - STACK_ROOT: "C:\\sr" - steps: - - checkout: self - - task: Cache@2 - inputs: - key: stack-root-cache | $(Agent.OS) | $(Build.SourcesDirectory)/stack-windows.yaml | $(Build.SourcesDirectory)/ghcide.cabal - path: $(STACK_ROOT) - cacheHitVar: STACK_ROOT_CACHE_RESTORED - displayName: "Cache stack root" - - task: Cache@2 - inputs: - key: stack-work-cache | $(Agent.OS) | $(Build.SourcesDirectory)/stack-windows.yaml | $(Build.SourcesDirectory)/ghcide.cabal - path: .stack-work - cacheHitVar: STACK_WORK_CACHE_RESTORED - displayName: "Cache stack work" - - bash: | - ./fmt.sh - displayName: "HLint via ./fmt.sh" - - bash: | - curl -sSkL http://www.stackage.org/stack/windows-x86_64 -o /usr/bin/stack.zip - unzip -o /usr/bin/stack.zip -d /usr/bin/ - mkdir -p "$STACK_ROOT" - displayName: 'Install Stack' - - bash: stack setup --stack-yaml stack-windows.yaml - displayName: 'stack setup' - - bash: | - # Installing happy and alex standalone to avoid error "strip.exe: unable to rename ../*.exe; reason: File exists" - stack install happy --stack-yaml stack-windows.yaml - stack install alex --stack-yaml stack-windows.yaml - choco install -y cabal --version=$CABAL_VERSION - $(cygpath $ProgramData)/chocolatey/bin/RefreshEnv.cmd - # GHC 8.10.1 fails with ghc segfaults, using -fexternal-interpreter seems to make it working - # There are other transient errors like timeouts downloading from stackage so we retry 3 times - stack build --test --no-run-tests --stack-yaml stack-windows.yaml --ghc-options="-fexternal-interpreter" || stack build --test --no-run-tests --stack-yaml stack-windows.yaml --ghc-options="-fexternal-interpreter" || stack build --test --no-run-tests --stack-yaml stack-windows.yaml --ghc-options="-fexternal-interpreter" - displayName: 'stack build --test' From de907b38a774e39c30a59d7cf0299e41e9147bd7 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 21:54:08 +0100 Subject: [PATCH 02/11] Update hackage index to 2021-02-08T19:11:03Z --- cabal.project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index 51c92afb7c..7194a02f25 100644 --- a/cabal.project +++ b/cabal.project @@ -25,7 +25,7 @@ package ghcide write-ghc-environment-files: never -index-state: 2021-02-03T00:50:21Z +index-state: 2021-02-08T19:11:03Z allow-newer: active:base, From acc73f56ffb40fe40bc8a7a46caf5e0e2f515adc Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 21:55:21 +0100 Subject: [PATCH 03/11] Update 8.10.3 resolver and use it for 8.10.4 --- stack-8.10.3.yaml | 4 +--- stack-8.10.4.yaml | 61 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 stack-8.10.4.yaml diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml index cbdaa33ee7..c4a6aa04ba 100644 --- a/stack-8.10.3.yaml +++ b/stack-8.10.3.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2021-01-17 +resolver: nightly-2021-02-06 packages: - . @@ -19,14 +19,12 @@ ghc-options: "$everything": -haddock extra-deps: - - apply-refact-0.9.0.0 - brittany-0.13.1.0 - 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-exactprint-0.6.3.4 - heapsize-0.3.0 - implicit-hie-cradle-0.3.0.2 - implicit-hie-0.1.2.5 diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml new file mode 100644 index 0000000000..77d4e93ef5 --- /dev/null +++ b/stack-8.10.4.yaml @@ -0,0 +1,61 @@ +resolver: nightly-2021-02-06 +compiler: ghc-8.10.4 + +packages: + - . + - ./hie-compat + - ./ghcide/ + - ./hls-plugin-api + # - ./shake-bench + - ./plugins/hls-class-plugin + - ./plugins/hls-haddock-comments-plugin + - ./plugins/hls-eval-plugin + - ./plugins/hls-explicit-imports-plugin + - ./plugins/hls-hlint-plugin + - ./plugins/hls-retrie-plugin + - ./plugins/hls-splice-plugin + - ./plugins/hls-tactics-plugin + +ghc-options: + "$everything": -haddock + +extra-deps: + - brittany-0.13.1.0 + - 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 + - heapsize-0.3.0 + - implicit-hie-cradle-0.3.0.2 + - implicit-hie-0.1.2.5 + - lsp-test-0.12.0.0 + - monad-dijkstra-0.1.1.2 + - refinery-0.3.0.0 + - retrie-0.1.1.1 + - stylish-haskell-0.12.2.0 + - semigroups-0.18.5 + - temporary-1.2.1.1 + - haskell-lsp-0.23.0.0 + - haskell-lsp-types-0.23.0.0 + - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727 + - hiedb-0.3.0.1 + +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 + +nix: + packages: [ icu libcxx zlib ] + +concurrent-tests: false From 3eea0941059f5fe95394fb5f44deb761b3ffebd9 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 21:55:59 +0100 Subject: [PATCH 04/11] Use last 8.8.4 lts resolver --- stack-8.8.4.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml index 7d92021668..5265b528fc 100644 --- a/stack-8.8.4.yaml +++ b/stack-8.8.4.yaml @@ -1,4 +1,4 @@ -resolver: lts-16.25 +resolver: lts-16.31 # last 8.8.4 lts packages: - . @@ -29,8 +29,6 @@ extra-deps: - floskell-0.10.4 - fourmolu-0.3.0.0 - ghc-exactprint-0.6.3.4 - - ghc-lib-8.10.3.20201220 - - ghc-lib-parser-8.10.3.20201220 - ghc-trace-events-0.1.2.1 - haskell-lsp-0.23.0.0 - haskell-lsp-types-0.23.0.0 @@ -54,7 +52,6 @@ extra-deps: - semigroups-0.18.5 - stylish-haskell-0.12.2.0 - temporary-1.2.1.1 - - uniplate-1.6.13 - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727 - hiedb-0.3.0.1 - sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002 From 013a98aefe168eee986d8745e7991a2251faaafa Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 22:00:16 +0100 Subject: [PATCH 05/11] Drop 8.10.1: stack.yaml --- stack-8.10.1.yaml | 72 ----------------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 stack-8.10.1.yaml diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml deleted file mode 100644 index 18aea7c9fc..0000000000 --- a/stack-8.10.1.yaml +++ /dev/null @@ -1,72 +0,0 @@ -resolver: nightly-2020-08-16 # Last 8.10.1 - -packages: -- . -- ./hie-compat -- ./ghcide/ -# - ./shake-bench -- ./hls-plugin-api -- ./plugins/hls-class-plugin -- ./plugins/hls-haddock-comments-plugin -- ./plugins/hls-eval-plugin -- ./plugins/hls-explicit-imports-plugin -- ./plugins/hls-hlint-plugin -- ./plugins/hls-retrie-plugin -- ./plugins/hls-splice-plugin -- ./plugins/hls-tactics-plugin - -ghc-options: - "$everything": -haddock - -extra-deps: - - apply-refact-0.9.0.0 - - brittany-0.13.1.0 - - 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-exactprint-0.6.3.4 - - ghc-lib-8.10.3.20201220 - - ghc-lib-parser-8.10.3.20201220 - - haskell-lsp-0.23.0.0 - - haskell-lsp-types-0.23.0.0 - - heapsize-0.3.0 - - hie-bios-0.7.1 - - hlint-3.2.3 - - HsYAML-aeson-0.2.0.0@rev:2 - - implicit-hie-cradle-0.3.0.2 - - implicit-hie-0.1.2.5 - - lsp-test-0.12.0.0 - - 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 - - stylish-haskell-0.12.2.0 - - semigroups-0.18.5 - - temporary-1.2.1.1 - - uniplate-1.6.13 - - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727 - - hiedb-0.3.0.1 - -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 - -nix: - packages: [icu libcxx zlib] - -concurrent-tests: false From 5a6d5841c0971a59e7c4e919d68f4fa5921612fd Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 22:18:29 +0100 Subject: [PATCH 06/11] Add 8.10.4 and remove 8.10.1 from ci --- .circleci/config.yml | 12 ++++++------ .github/mergify.yml | 14 +++++++------- .github/workflows/bench.yml | 4 ++-- .github/workflows/build.yml | 10 +++++----- .github/workflows/test.yml | 13 +++---------- 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 72452c41cf..715de0f01f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -96,11 +96,6 @@ jobs: - STACK_FILE: "stack-8.8.4.yaml" <<: *defaults - ghc-8.10.1: - environment: - - STACK_FILE: "stack-8.10.1.yaml" - <<: *defaults - ghc-8.10.2: environment: - STACK_FILE: "stack-8.10.2.yaml" @@ -111,6 +106,11 @@ jobs: - STACK_FILE: "stack-8.10.3.yaml" <<: *defaults + ghc-8.10.4: + environment: + - STACK_FILE: "stack-8.10.4.yaml" + <<: *defaults + ghc-default: environment: - STACK_FILE: "stack.yaml" @@ -126,7 +126,7 @@ workflows: - ghc-8.8.2 - ghc-8.8.3 - ghc-8.8.4 - - ghc-8.10.1 - ghc-8.10.2 - ghc-8.10.3 + - ghc-8.10.4 - ghc-default diff --git a/.github/mergify.yml b/.github/mergify.yml index fc83bd825f..4bf9293653 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -5,18 +5,18 @@ pull_request_rules: method: squash name: Automatically merge pull requests conditions: - - status-success=bench-example (8.10.3, ubuntu-latest, Cabal-3.0.0.0) - - status-success=bench-example (8.10.3, ubuntu-latest, lsp-types-1.0.0.1) + - status-success=bench-example (8.10.4, ubuntu-latest, Cabal-3.0.0.0) + - status-success=bench-example (8.10.4, ubuntu-latest, lsp-types-1.0.0.1) - status-success=nix (default, ubuntu-latest) - status-success=nix (default, macOS-latest) + - status-success=test (8.10.4, ubuntu-latest) + - status-success=test (8.10.4, macOS-latest) - status-success=test (8.10.3, ubuntu-latest) - status-success=test (8.10.3, macOS-latest) - status-success=test (8.10.2, ubuntu-latest) - status-success=test (8.10.2, macOS-latest) - - status-success=test (8.10.1, ubuntu-latest) - - status-success=test (8.10.1, macOS-latest) - status-success=test (8.8.4, ubuntu-latest) - status-success=test (8.8.4, macOS-latest) - status-success=test (8.8.3, ubuntu-latest) @@ -27,15 +27,15 @@ pull_request_rules: - status-success=test (8.6.5, macOS-latest) - status-success=test (8.6.4, ubuntu-latest) - status-success=test (8.6.4, macOS-latest) - - status-success=test (windows-latest, 8.10.3, true) + - status-success=test (windows-latest, 8.10.4, true) + - status-success=test (windows-latest, 8.10.3) - status-success=test (windows-latest, 8.6.5, true) - status-success=test (windows-latest, 8.10.2.2) - - status-success=test (windows-latest, 8.10.1) # - status-success=test (windows-latest, 8.6.4) + - 'status-success=ci/circleci: ghc-8.10.4' - 'status-success=ci/circleci: ghc-8.10.3' - 'status-success=ci/circleci: ghc-8.10.2' - - 'status-success=ci/circleci: ghc-8.10.1' - 'status-success=ci/circleci: ghc-8.8.4' - 'status-success=ci/circleci: ghc-8.8.3' - 'status-success=ci/circleci: ghc-8.8.2' diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml index 217bc40d6c..e0019ef8e6 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.3'] + ghc: ['8.10.4'] os: [ubuntu-latest] steps: @@ -76,7 +76,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.3'] + ghc: ['8.10.4'] os: [ubuntu-latest] example: ['Cabal-3.0.0.0', 'lsp-types-1.0.0.1'] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 293f61e5df..8199331bef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ['8.10.3', '8.10.2', '8.10.1', '8.8.4', '8.8.3', '8.8.2', '8.6.5', '8.6.4'] + ghc: ['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, windows-latest] exclude: - os: windows-latest @@ -113,11 +113,11 @@ jobs: path: ${{ steps.compress_server_binary.outputs.path }} - name: Build Wrapper - if: matrix.ghc == '8.10.1' + if: matrix.ghc == '8.10.4' run: cabal build exe:hls-wrapper -O2 $LINUX_CABAL_ARGS - name: Compress Wrapper Binary - if: matrix.ghc == '8.10.1' + if: matrix.ghc == '8.10.4' id: compress_wrapper_binary run: | HLS_WRAPPER_BUILD=$(find dist-newstyle \( -name 'hls-wrapper' -o -name 'hls-wrapper.exe' \) -type f) @@ -136,7 +136,7 @@ jobs: fi - name: Upload Wrapper - if: matrix.ghc == '8.10.1' + if: matrix.ghc == '8.10.4' uses: actions/upload-release-asset@v1.0.2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -147,7 +147,7 @@ jobs: asset_content_type: ${{ steps.compress_wrapper_binary.outputs.content_type}} - uses: actions/upload-artifact@v2 - if: matrix.ghc == '8.10.1' + if: matrix.ghc == '8.10.4' with: name: haskell-language-server-wrapper-${{ runner.OS }}${{env.EXE_EXT}}.${{ steps.compress_wrapper_binary.outputs.extension }} path: ${{ steps.compress_wrapper_binary.outputs.path }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f79587045e..f91bc87528 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,20 +11,15 @@ jobs: strategy: fail-fast: true matrix: - ghc: ["8.10.3", "8.10.2", "8.10.1", "8.8.4", "8.8.3", "8.8.2", "8.6.5", "8.6.4"] + ghc: ["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: - # one ghc-lib build - # should be renabled: #784 - # - os: ubuntu-latest - # ghc: '8.10.1' - # ghc-lib: true # only test supported ghc major versions - os: ubuntu-latest - ghc: '8.10.3' + ghc: '8.10.4' test: true - os: windows-latest - ghc: '8.10.3' + ghc: '8.10.4' test: true - os: ubuntu-latest ghc: '8.8.4' @@ -38,8 +33,6 @@ jobs: # only build rest of supported ghc versions for windows - os: windows-latest ghc: '8.10.2.2' - - os: windows-latest - ghc: '8.10.1' # This build get stuck frequently # - os: windows-latest # ghc: '8.6.4' From 772596ec014f7b9d9ee4eb37dec233121f062ac6 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 22:21:28 +0100 Subject: [PATCH 07/11] Add 8.10.4 and remove 8.10.1 from .cabal files --- ghcide/ghcide.cabal | 2 +- haskell-language-server.cabal | 2 +- test/wrapper/testdata/{stack-8.10.1 => stack-8.10.3}/foo.cabal | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename test/wrapper/testdata/{stack-8.10.1 => stack-8.10.3}/foo.cabal (100%) diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 2c07a5ec58..034a700985 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/ghcide#readme bug-reports: https://github.com/haskell/ghcide/issues -tested-with: GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.1 || == 8.10.2 || == 8.10.3 +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 extra-source-files: include/ghc-api-version.h README.md CHANGELOG.md test/data/hover/*.hs test/data/multi/cabal.project diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index a43cb28ad0..32e72be563 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.1 || == 8.10.2 || == 8.10.3 +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 extra-source-files: README.md ChangeLog.md diff --git a/test/wrapper/testdata/stack-8.10.1/foo.cabal b/test/wrapper/testdata/stack-8.10.3/foo.cabal similarity index 100% rename from test/wrapper/testdata/stack-8.10.1/foo.cabal rename to test/wrapper/testdata/stack-8.10.3/foo.cabal From 6030e86428746bdef98e17d27bb46e532f54fe4e Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 22:21:48 +0100 Subject: [PATCH 08/11] Add 8.10.4 and remove 8.10.1 from nix --- nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/default.nix b/nix/default.nix index a570f8f6ba..360f1f15da 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -35,9 +35,9 @@ let ourHaskell = pkgs.haskell // { packages = pkgs.haskell.packages // { # relax upper bounds on ghc 8.10.x versions (and skip running tests) - ghc8101 = extended (pkgs.haskell.packages.ghc8101.override sharedOverrides); ghc8102 = extended (pkgs.haskell.packages.ghc8102.override sharedOverrides); ghc8103 = extended (pkgs.haskell.packages.ghc8103.override sharedOverrides); + ghc8104 = extended (pkgs.haskell.packages.ghc8104.override sharedOverrides); }; }; }; From 6a732b5b9d82cdf9dd8ec3348baf04b0dbf207d5 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 8 Feb 2021 22:27:55 +0100 Subject: [PATCH 09/11] Drop specific skipping for ghc-8.10.1 --- ghcide/test/exe/Main.hs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/ghcide/test/exe/Main.hs b/ghcide/test/exe/Main.hs index e61d6382a4..877ddd1f9c 100644 --- a/ghcide/test/exe/Main.hs +++ b/ghcide/test/exe/Main.hs @@ -3148,7 +3148,6 @@ checkFileCompiles fp diag = pluginSimpleTests :: TestTree pluginSimpleTests = - ignoreTest8101 "GHC #18070" $ ignoreInWindowsForGHC88And810 $ testSessionWithExtraFiles "plugin" "simple plugin" $ \dir -> do _ <- openDoc (dir "KnownNat.hs") "haskell" @@ -3163,7 +3162,6 @@ pluginSimpleTests = pluginParsedResultTests :: TestTree pluginParsedResultTests = - ignoreTest8101 "GHC #18070" $ ignoreInWindowsForGHC88And810 $ testSessionWithExtraFiles "plugin" "parsedResultAction plugin" $ \dir -> do _ <- openDoc (dir "RecordDot.hs") "haskell" @@ -4026,11 +4024,6 @@ pattern R x y x' y' = Range (Position x y) (Position x' y') xfail :: TestTree -> String -> TestTree xfail = flip expectFailBecause -ignoreTest8101 :: String -> TestTree -> TestTree -ignoreTest8101 - | GHC_API_VERSION == ("8.10.1" :: String) = ignoreTestBecause - | otherwise = const id - ignoreInWindowsBecause :: String -> TestTree -> TestTree ignoreInWindowsBecause = if isWindows then ignoreTestBecause else (\_ x -> x) From 2526b892d158238336d05fe08dee873775a77a00 Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 9 Feb 2021 06:10:02 +0100 Subject: [PATCH 10/11] Replace 8.10.1 with 8.10.4 in wrapper test --- test/wrapper/Main.hs | 4 ++-- test/wrapper/testdata/stack-8.10.1/stack.yaml | 1 - test/wrapper/testdata/{stack-8.10.1 => stack-8.10.4}/Lib.hs | 0 .../wrapper/testdata/{stack-8.10.3 => stack-8.10.4}/foo.cabal | 0 test/wrapper/testdata/stack-8.10.4/stack.yaml | 1 + 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 test/wrapper/testdata/stack-8.10.1/stack.yaml rename test/wrapper/testdata/{stack-8.10.1 => stack-8.10.4}/Lib.hs (100%) rename test/wrapper/testdata/{stack-8.10.3 => stack-8.10.4}/foo.cabal (100%) create mode 100644 test/wrapper/testdata/stack-8.10.4/stack.yaml diff --git a/test/wrapper/Main.hs b/test/wrapper/Main.hs index e071327f81..06aef44d25 100644 --- a/test/wrapper/Main.hs +++ b/test/wrapper/Main.hs @@ -18,8 +18,8 @@ main = do projectGhcVersionTests :: TestTree projectGhcVersionTests = testGroup "--project-ghc-version" - [ testCase "stack with ghc 8.10.1" $ - testDir "test/wrapper/testdata/stack-8.10.1" "8.10.1" + [ testCase "stack with ghc 8.10.4" $ + testDir "test/wrapper/testdata/stack-8.10.4" "8.10.4" , testCase "stack with ghc 8.8.3" $ testDir "test/wrapper/testdata/stack-8.8.3" "8.8.3" , testCase "cabal with global ghc" $ do diff --git a/test/wrapper/testdata/stack-8.10.1/stack.yaml b/test/wrapper/testdata/stack-8.10.1/stack.yaml deleted file mode 100644 index 409e7fe489..0000000000 --- a/test/wrapper/testdata/stack-8.10.1/stack.yaml +++ /dev/null @@ -1 +0,0 @@ -resolver: ghc-8.10.1 diff --git a/test/wrapper/testdata/stack-8.10.1/Lib.hs b/test/wrapper/testdata/stack-8.10.4/Lib.hs similarity index 100% rename from test/wrapper/testdata/stack-8.10.1/Lib.hs rename to test/wrapper/testdata/stack-8.10.4/Lib.hs diff --git a/test/wrapper/testdata/stack-8.10.3/foo.cabal b/test/wrapper/testdata/stack-8.10.4/foo.cabal similarity index 100% rename from test/wrapper/testdata/stack-8.10.3/foo.cabal rename to test/wrapper/testdata/stack-8.10.4/foo.cabal diff --git a/test/wrapper/testdata/stack-8.10.4/stack.yaml b/test/wrapper/testdata/stack-8.10.4/stack.yaml new file mode 100644 index 0000000000..361dfba330 --- /dev/null +++ b/test/wrapper/testdata/stack-8.10.4/stack.yaml @@ -0,0 +1 @@ +resolver: ghc-8.10.4 From 2d956cd6350355995bc4d95bf3ca7ce6c45dce0e Mon Sep 17 00:00:00 2001 From: jneira Date: Tue, 9 Feb 2021 22:09:35 +0100 Subject: [PATCH 11/11] Add ghc-8.10.3 windows build --- .github/workflows/test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f91bc87528..0589176ff0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,8 @@ jobs: # only build rest of supported ghc versions for windows - os: windows-latest ghc: '8.10.2.2' + - os: windows-latest + ghc: '8.10.3' # This build get stuck frequently # - os: windows-latest # ghc: '8.6.4'