WIP

Author: Anton-Latukha

.github/workflows/cache-deps.yml

@@ -26,12 +26,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc-version: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.8.3", "8.6.5"]
-        cabal-version: ["3.4"]
+        ghc: ["9.0.1", '8.10.7', '8.10.6', "8.8.4", "8.8.3", "8.6.5"]
+        cabal: ["3.4"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
         exclude:
           - os: windows-latest
-            ghc-version: '8.8.3'
+            ghc: '8.8.3'
 
     steps:
       - uses: actions/checkout@v2
@@ -41,8 +41,8 @@ jobs:
       - uses: haskell/actions/setup@v1
         id: HaskEnvSetup
         with:
-          ghc-version: ${{ matrix.ghc-version }}
-          cabal-version: ${{ matrix.cabal-version }}
+          ghc-version: ${{ matrix.ghc }}
+          cabal-version: ${{ matrix.cabal }}
 
       - if: runner.os == 'Windows'
         name: (Windows) Platform config
@@ -55,16 +55,26 @@ jobs:
           echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
 
       # Needs to be before Cache Cabal so the cache can detect changes to the modified cabal.project file
-      - if: matrix.ghc-version == '9.0.1'
-        name: Use modified cabal.project for ghc9
+      - if: matrix.ghc == '9.0.1'
+        name: (GHC 9.0.1) Use modified `cabal.project`
         run: cp cabal-ghc901.project cabal.project
 
-      - if: matrix.ghc-version == '8.8.4' && matrix.os == 'windows-latest'
-        name: Modify cabal.project to workaround segfaults for ghc-8.8.4 and windows
+      - if: runner.os == 'Windows' && matrix.ghc == '8.8.4'
+        name: (Windows,GHC 8.8) Modify `cabal.project` to workaround segfaults
         run: |
           echo "package floskell" >> cabal.project
           echo "  ghc-options: -O0" >> cabal.project
 
+      # Work around for filepath length limits in Windows
+      - if: runner.os == 'Windows'
+        name: (Windows) Shorten binary names
+        run: |
+          sed -i.bak -e 's/haskell-language-server/hls/g' \
+                     -e 's/haskell_language_server/hls/g' \
+                     haskell-language-server.cabal cabal.project
+          sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
+                     src/**/*.hs exe/*.hs
+
       - name: Retrieving `cabal.project` Hackage timestamp
         run: |
           TIMESTAMP="$(grep index-state cabal.project)"
@@ -88,25 +98,15 @@ jobs:
           cache-name: compiled-deps
         with:
           path: ${{ steps.HaskEnvSetup.outputs.cabal-store }}
-          key:          ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc-version }}-${{ env.HACKAGE_TIMESTAMP }}-${{ hashFiles('cabal.project') }}
+          key:          ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-${{ env.HACKAGE_TIMESTAMP }}-${{ hashFiles('cabal.project') }}
           restore-keys: |
-                        ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc-version }}-${{ env.HACKAGE_TIMESTAMP }}-
-                        ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc-version }}-
-
-      # Work around for filepath length limits in Windows
-      - if: runner.os == 'Windows'
-        name: (Windows) Shorten binary names
-        run: |
-          sed -i.bak -e 's/haskell-language-server/hls/g' \
-                     -e 's/haskell_language_server/hls/g' \
-                     haskell-language-server.cabal cabal.project
-          sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
-                     src/**/*.hs exe/*.hs
+                        ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-${{ env.HACKAGE_TIMESTAMP }}-
+                        ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-
 
       - name: Build
         run: cabal v2-build --enable-tests --enable-benchmarks --only-dependencies
 
       # repeating builds to workaround segfaults in windows and ghc-8.8.4
       - if: runner.os == 'Windows'
-        name: (Windows) Run build additional 2 times
+        name: (Windows) Run build 2 additional times
         run: cabal v2-build --enable-tests --enable-benchmarks --only-dependencies || cabal v2-build --enable-tests --enable-benchmarks --only-dependencies