diff --git a/.github/workflows/caching.yml b/.github/workflows/caching.yml index b9e25eee4..569d38095 100644 --- a/.github/workflows/caching.yml +++ b/.github/workflows/caching.yml @@ -89,10 +89,6 @@ jobs: - ubuntu-latest - macOS-latest - windows-latest - exclude: - # We disable this this combo in test.yml due to long path issues, so we also need to disable it here - - os: windows-latest - ghc: "9.2" steps: - uses: actions/checkout@v3 @@ -105,7 +101,7 @@ jobs: # Fetching from github cache is faster than doing it from hackage # Sources does not change per ghc and ghc version son only doing it # for one matrix job (it is arbitrary) - - if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '9.2' + - if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '9.6' name: Download sources run: | cabal $cabalBuild --only-download --enable-benchmarks --enable-tests @@ -120,7 +116,7 @@ jobs: # We build ghcide with benchs and test enabled to include its dependencies in the cache # (including shake-bench) # Only for the same ghc and os used in the bench workflow, so we save cache space - - if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '9.2' + - if: steps.compiled-deps.outputs.cache-hit != 'true' && runner.os == 'Linux' && matrix.ghc == '9.6' name: Build ghcide benchmark run: | cabal $cabalBuild ghcide --enable-benchmarks --enable-tests diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 2775ca37a..a9469851d 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -27,7 +27,7 @@ jobs: - uses: ./.github/actions/setup-build with: # select a stable GHC version - ghc: 9.2 + ghc: 9.6 os: ${{ runner.os }} shorten-hls: false diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ab495dd69..243fc3e2f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -118,15 +118,6 @@ jobs: # Perhaps we can migrate *all* unknown linux builds to a uniform # image. include: - - ghc: 9.2.8 - platform: - { image: "rockylinux:8" - , installCmd: "yum -y install epel-release && yum install -y --allowerasing" - , toolRequirements: "autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf" - , DISTRO: "Unknown" - , ARTIFACT: "x86_64-linux-unknown" - , ADD_CABAL_ARGS: "--enable-split-sections" - } - ghc: 9.4.8 platform: { image: "fedora:27" @@ -222,7 +213,7 @@ jobs: strategy: fail-fast: true matrix: - ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8", "9.2.8" ] + ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8"] steps: - uses: docker://arm64v8/ubuntu:focal name: Cleanup (aarch64 linux) @@ -282,7 +273,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8", "9.2.8"] + ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8"] steps: - name: Checkout code uses: actions/checkout@v3 @@ -327,7 +318,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8", "9.2.8"] + ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8"] steps: - name: Checkout code uses: actions/checkout@v3 @@ -372,7 +363,7 @@ jobs: strategy: fail-fast: false matrix: - ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8", "9.2.8"] + ghc: ["9.10.1", "9.8.2", "9.6.5", "9.4.8"] steps: - name: install windows deps shell: pwsh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 84e75963d..4cb22adbd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -78,9 +78,6 @@ jobs: - true - false exclude: - # Don't do anything for windows on 9.2, it has particularly bad long-path issues - - os: windows-latest - ghc: "9.2" # Exclude the test configuration on macos, it's sufficiently similar to other OSs # that it mostly just burns CI time. Buiding is still useful since it catches # solver issues. @@ -164,7 +161,7 @@ jobs: run: cabal test hls-splice-plugin-tests || cabal test hls-splice-plugin-tests # TODO enable when it supports 9.10 - - if: matrix.test && matrix.ghc != '9.2' && matrix.ghc != '9.10' + - if: matrix.test && matrix.ghc != '9.10' name: Test hls-stan-plugin run: cabal test hls-stan-plugin-tests || cabal test hls-stan-plugin-tests @@ -231,7 +228,7 @@ jobs: run: cabal test hls-explicit-record-fields-plugin-tests || cabal test hls-explicit-record-fields-plugin-tests ## version needs to be limited since the tests depend on cabal-fmt which only builds using specific ghc versions - - if: matrix.test && matrix.ghc == '9.2' + - if: matrix.test && matrix.ghc == '9.2' # TODO cabal-fmt only worked with 9.2? decide what to do with it name: Test hls-cabal-fmt-plugin test suite run: cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests || cabal test hls-cabal-fmt-plugin-tests --flag=isolateCabalfmtTests diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index 8a60854cc..428fbe32f 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -189,7 +189,7 @@ stack install haskell-language-server You also can leverage `ghcup compile hls`: ```bash -ghcup compile hls -v 1.9.0.0 --ghc 9.2.5 +ghcup compile hls -v 2.9.0.0 --ghc 9.6.5 ``` ### Preprocessors diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 26b9256a8..03934f6d5 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -14,7 +14,7 @@ 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 ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8 || ==9.2.8 +tested-with: GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8 extra-source-files: CHANGELOG.md README.md diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 859d65dcd..d96f28ae9 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 ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8 || ==9.2.8 +tested-with: GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8 extra-source-files: README.md ChangeLog.md @@ -764,13 +764,13 @@ flag stan manual: True common stan - if flag(stan) && (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.10.0)) + if flag(stan) && impl(ghc < 9.10.0) build-depends: haskell-language-server:hls-stan-plugin cpp-options: -Dhls_stan library hls-stan-plugin import: defaults, pedantic, warnings - if flag(stan) && (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.10.0)) + if flag(stan) && impl(ghc < 9.10.0) buildable: True else buildable: False @@ -798,7 +798,7 @@ library hls-stan-plugin test-suite hls-stan-plugin-tests import: defaults, pedantic, test-defaults, warnings - if flag(stan) && (impl(ghc > 8.8.1) && impl(ghc <= 9.2.3) || impl(ghc >= 9.4.0) && impl(ghc < 9.10.0)) + if flag(stan) && impl(ghc < 9.10.0) buildable: True else buildable: False diff --git a/test/wrapper/testdata/stack-with-dist-newstyle/stack.yaml b/test/wrapper/testdata/stack-with-dist-newstyle/stack.yaml index e467bdb28..d95c1a7a0 100644 --- a/test/wrapper/testdata/stack-with-dist-newstyle/stack.yaml +++ b/test/wrapper/testdata/stack-with-dist-newstyle/stack.yaml @@ -1,2 +1,2 @@ # specific version does not matter -resolver: ghc-9.2.5 +resolver: ghc-9.6.5