@@ -68,8 +68,6 @@ jobs:
69 path: ~/.cabal
69 path: ~/.cabal
70 key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }}
70 key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }}
72− ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global
74 - name: Cache cabal work
72 - name: Cache cabal work
75 id: cabal-local
73 id: cabal-local
@@ -77,8 +75,6 @@ jobs:
78 path: dist-newstyle
76 path: dist-newstyle
79 key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local
77 key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local
81− ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local
83 - name: Install dependencies
79 - name: Install dependencies
@@ -113,15 +109,14 @@ jobs:
113 uses: actions/cache@v1
109 uses: actions/cache@v1
115 path: C:\Users\runneradmin\AppData\Roaming\stack\
111 path: C:\Users\runneradmin\AppData\Roaming\stack\
116− key: ${{ runner.os }}-appdata-roaming-stack-${{ hashFiles('**.yaml') }}
112+ key: ${{ runner.os }}-appdata-roaming-stack-${{ hashFiles('stack.yaml') }}
117− restore-keys: ${{ runner.os }}-appdata-roaming-stack
119 # stack's local package dbs for the project and each package
114 # stack's local package dbs for the project and each package
120 # - name: Cache .stack-work
115 # - name: Cache .stack-work
121 # uses: actions/cache@v1
116 # uses: actions/cache@v1
123 # path: .stack-work
118 # path: .stack-work
124− # key: ${{ runner.os }}-stack-work-${{ hashFiles('**.yaml') }}
119+ # key: ${{ runner.os }}-stack-work-${{ hashFiles('stack.yaml') }}
125 # restore-keys: ${{ runner.os }}-stack-work
120 # restore-keys: ${{ runner.os }}-stack-work
127 - name: Install dependencies
122 - name: Install dependencies
@@ -152,10 +147,7 @@ jobs:
152 uses: actions/cache@v1
147 uses: actions/cache@v1
154 path: ~/.stack
149 path: ~/.stack
155− key: ${{ runner.os }}-stack-global-${{ hashFiles('**.yaml') }}
150+ key: ${{ runner.os }}-stack-global-${{ hashFiles('stack.yaml') }}
157− ${{ runner.os }}-stack-global
158− ${{ runner.os }}-stack
160 # stack's local package db
152 # stack's local package db
161 # - name: Cache .stack-work
153 # - name: Cache .stack-work