Merge branch 'master' into fix-source-plugins

Author: fendor

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

@@ -23,7 +23,7 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - uses: haskell/actions/setup@v1
+    - uses: haskell/actions/setup@v2
       id: HaskEnvSetup
       with:
         ghc-version  : ${{ inputs.ghc   }}
@@ -74,7 +74,7 @@ runs:
     # We have to restore package sources before `cabal update`
     # because it overwrites the hackage index with the cached one
     - name: Hackage sources cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: hackage-sources
       with:
@@ -99,7 +99,7 @@ runs:
 
     - name: Compiled deps cache
       id: compiled-deps
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       env:
         cache-name: compiled-deps
       with:

.github/workflows/bench.yml

@@ -21,7 +21,7 @@ jobs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5.2.0
+        uses: fkirc/skip-duplicate-actions@v5.3.0
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.7', '9.2.4']
+        ghc: ['8.10.7', '9.2.5']
         os: [ubuntu-latest]
 
     # This code is fitted to the strategy: assumes Linux is used ... etc,
@@ -104,7 +104,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ['8.10.7', '9.2.4']
+        ghc: ['8.10.7', '9.2.5']
         os: [ubuntu-latest]
         cabal: ['3.6']
         example: ['cabal', 'lsp-types']

.github/workflows/caching.yml

@@ -57,7 +57,7 @@ jobs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5.2.0
+        uses: fkirc/skip-duplicate-actions@v5.3.0
         with:
           cancel_others: false
           paths_ignore: '["**/docs/**"
@@ -80,15 +80,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: [ "9.2.4"
-             , "9.2.3"
+        # 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"
+             , "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/flags.yml

@@ -21,7 +21,7 @@ jobs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5.2.0
+        uses: fkirc/skip-duplicate-actions@v5.3.0
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"
@@ -44,7 +44,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        ghc: [ "9.2.4"
+        ghc: [ "9.2.5"
              , "9.0.2"
              , "8.10.7"
              ]
@@ -65,8 +65,8 @@ jobs:
       - name: Build `ghcide` with flags
         run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
 
-      # we have to clean up warnings for 9.0 and 9.2 before enable -WAll
-      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4'
+      # we have to clean up warnings for 9.0 and 9.2 before enable -Wall
+      - if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.5'
         name: Build with pedantic (-WError)
         run: cabal v2-build --flags="pedantic"
 

.github/workflows/hackage.yml

@@ -28,6 +28,7 @@ jobs:
       matrix:
         package: ["hie-compat", "hls-graph", "shake-bench",
                   "hls-plugin-api", "ghcide", "hls-test-utils",
+                  "hls-cabal-plugin",
                   "hls-brittany-plugin", "hls-floskell-plugin", "hls-fourmolu-plugin",
                   "hls-ormolu-plugin", "hls-stylish-haskell-plugin",
                   "hls-class-plugin", "hls-eval-plugin", "hls-explicit-imports-plugin",
@@ -37,6 +38,7 @@ jobs:
                   "hls-splice-plugin", "hls-tactics-plugin",
                   "hls-call-hierarchy-plugin", "hls-alternate-number-format-plugin",
                   "hls-qualify-imported-names-plugin", "hls-code-range-plugin",
+                  "hls-cabal-fmt-plugin",
                   "haskell-language-server"]
         ghc: [ "9.0.2"
              , "8.10.7"

.github/workflows/hlint.yml

@@ -15,7 +15,7 @@ jobs:
     - name: 'Installing'
       uses: rwe/actions-hlint-setup@v1
       with:
-        version: '3.4'
+        version: '3.5'
 
     - name: 'Checking code'
       uses: rwe/actions-hlint-run@v2

.github/workflows/nix.yml

@@ -21,7 +21,7 @@ jobs:
       should_skip_build: ${{ steps.skip_check_no_nix.outputs.should_skip }}
     steps:
       - id: skip_check
-        uses: fkirc/skip-duplicate-actions@v5.2.0
+        uses: fkirc/skip-duplicate-actions@v5.3.0
         with:
           cancel_others: false
           paths_ignore: '[ "**/docs/**"
@@ -36,7 +36,7 @@ jobs:
                          , ".gitlab/**"
                          ]'
       - id: skip_check_no_nix
-        uses: fkirc/skip-duplicate-actions@v5.2.0
+        uses: fkirc/skip-duplicate-actions@v5.3.0
         with:
           cancel_others: false
           paths: '[ "**.nix" ]'
@@ -57,12 +57,10 @@ jobs:
 
     - uses: cachix/install-nix-action@v18
       with:
-        install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
-        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
         extra_nix_config: |
           experimental-features = nix-command flakes
         nix_path: nixpkgs=channel:nixos-unstable
-    - uses: cachix/cachix-action@v11
+    - uses: cachix/cachix-action@v12
       with:
         name: haskell-language-server
         # Disable pushing, we will do that in job `build`
@@ -91,12 +89,10 @@ jobs:
 
     - uses: cachix/install-nix-action@v18
       with:
-        install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
-        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
         extra_nix_config: |
           experimental-features = nix-command flakes
         nix_path: nixpkgs=channel:nixos-unstable
-    - uses: cachix/cachix-action@v11
+    - uses: cachix/cachix-action@v12
       with:
         name: haskell-language-server
         authToken: ${{ secrets.HLS_CACHIX_AUTH_TOKEN }}

.github/workflows/pre-commit.yml

@@ -14,7 +14,7 @@ jobs:
         - name: Checkout code
           uses: actions/checkout@v3
         - name: Find changed files
-          uses: technote-space/get-diff-action@v6.1.0
+          uses: technote-space/get-diff-action@v6.1.2
           id: git-diff
           with:
             PATTERNS: |
@@ -26,6 +26,8 @@ jobs:
     - uses: actions/checkout@v3
     - uses: ./.github/actions/setup-build
       with:
+        # select a stable GHC version
+        ghc: 9.2.5
         os: ${{ runner.os }}
         shorten-hls: false