Merge branch 'master' into wip/usage-fixes

Author: wz1000

.github/actions/setup-build/action.yml

@@ -23,7 +23,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: haskell/actions/setup@v2
+    - uses: haskell/actions/setup@v2.3.3
       id: HaskEnvSetup
       with:
         ghc-version  : ${{ inputs.ghc   }}

.github/workflows/bench.yml

@@ -110,7 +110,7 @@ jobs:
         example: ['cabal', 'lsp-types']
 
     steps:
-    - uses: haskell/actions/setup@v2
+    - uses: haskell/actions/setup@v2.3.3
       with:
         ghc-version  : ${{ matrix.ghc   }}
         cabal-version: ${{ matrix.cabal }}

.github/workflows/caching.yml

@@ -82,25 +82,15 @@ jobs:
       matrix:
         # This list of GHC (including the "exclude" list) versions must match
         # to the list of GHC versions specified in 'test.yml'
-        ghc: [ "9.4.3"
-             , "9.4.2"
+        ghc: [ "9.4.4"
              , "9.2.5"
-             , "9.2.4"
              , "9.0.2"
              , "8.10.7"
              ]
         os: [ "ubuntu-latest"
             , "macOS-latest"
             , "windows-latest"
             ]
-        exclude:
-           # Exclude until https://github.com/haskell/actions/issues/129
-           # is resolved.
-           - os: windows-latest
-             ghc: '9.4.3' # Excluded because github action cannot install it
-           - os: windows-latest
-             ghc: '9.2.5'
-
     steps:
       - uses: actions/checkout@v3
 

.github/workflows/test.yml

@@ -60,33 +60,20 @@ jobs:
       # **don't forget**
       # to update the ghc versions in 'caching.yml'.
       matrix:
-        ghc: [ "9.4.3"
-             , "9.4.2"
+        ghc: [ "9.4.4"
              , "9.2.5"
-             , "9.2.4"
-             , "9.2.3"
              , "9.0.2"
              , "8.10.7"
              ]
         os: [ "ubuntu-latest"
             , "macOS-latest"
             , "windows-latest"
             ]
-        # don't build these versions
-        # they are broken for good reasons, e.g. compiler is bugged
-        # on that platform.
-        exclude:
-           # Exclude until https://github.com/haskell/actions/issues/129
-           # is resolved.
-           - os: windows-latest
-             ghc: '9.4.3' # Excluded because github action cannot install it
-           - os: windows-latest
-             ghc: '9.2.5'
         # Mark which GHC versions on which platform we want to test.
         include:
            # only test supported ghc major versions
            - os: ubuntu-latest
-             ghc: '9.4.3'
+             ghc: '9.4.4'
              test: true
            - os: ubuntu-latest
              ghc: '9.2.5'
@@ -98,12 +85,10 @@ jobs:
              ghc: '8.10.7'
              test: true
            - os: windows-latest
-             ghc: '9.4.2'
+             ghc: '9.4.4'
              test: true
-           # Test on 9.2.4 until https://github.com/haskell/actions/issues/129
-           # is resolved. Then switch to 9.2.5
            - os: windows-latest
-             ghc: '9.2.4'
+             ghc: '9.2.5'
              test: true
            - os: windows-latest
              ghc: '9.0.2'
@@ -181,11 +166,11 @@ jobs:
         name: Test hls-pragmas-plugin
         run: cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-pragmas-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
+      - if: matrix.test && matrix.ghc != '9.4.4'
         name: Test hls-eval-plugin
         run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
+      - if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4'
         name: Test hls-haddock-comments-plugin
         run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
 
@@ -205,7 +190,7 @@ jobs:
         name: Test hls-fourmolu-plugin
         run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
+      - if: matrix.test && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4'
         name: Test hls-tactics-plugin test suite
         run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
 
@@ -229,7 +214,7 @@ jobs:
         name: Test hls-hlint-plugin test suite
         run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
 
-      - if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.2' && matrix.ghc != '9.4.3'
+      - if: matrix.test && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5' && matrix.ghc != '9.4.4'
         name: Test hls-stan-plugin test suite
         run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stan-plugin --test-options="$TEST_OPTS"
 

hie-compat/hie-compat.cabal

@@ -33,7 +33,7 @@ library
   if flag(ghc-lib) && impl(ghc < 9)
     build-depends: ghc-lib < 9.0
   else
-    build-depends: ghc, ghc-boot
+    build-depends: ghc >= 8.10, ghc-boot
   if (impl(ghc >= 9.0) && impl(ghc < 9.1))
     ghc-options: -Wall -Wno-name-shadowing
   else