WIP

Author: Anton-Latukha

.github/workflows/cache-deps.yml

@@ -52,18 +52,17 @@ 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 == '9.0.1'
+      - if: matrix.ghc-version == '9.0.1'
         name: Use modified cabal.project for ghc9
         run: cp cabal-ghc901.project cabal.project
 
-      - if: matrix.ghc == '8.8.4' && matrix.os == 'windows-latest'
+      - 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
         run: |
           echo "package floskell" >> cabal.project
           echo "  ghc-options: -O0" >> cabal.project
 
-      - if: ( runner.os == 'Linux' ) || ( runner.os == 'macOS' )
-        name: (Linux,macOS) Platform config
+      - name: Retrieving `cabal.project` Hackage timestamp
         run: |
           TIMESTAMP="$(grep index-state cabal.project)"
           echo "HACKAGE_TIMESTAMP=$TIMESTAMP" >> $GITHUB_ENV
@@ -80,18 +79,16 @@ jobs:
 
       - run: cabal v2-update
 
-      # NOTE: Freeze is for the caching
-      - name: "Configuration freeze"
-        run: cabal v2-freeze --enable-tests --enable-benchmarks
-
       - name: Compiled deps cache
         uses: actions/cache@v2
         env:
           cache-name: compiled-deps
         with:
           path: ${{ steps.HaskEnvSetup.outputs.cabal-store }}
-          key:          ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
-          restore-keys: ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc }}-
+          key:          ${{ env.cache-name }}-${{ runner.os }}-${{ matrix.ghc-version }}-${{ 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'