;ci: use github cache v2
This may also clear the recent CI error with hledger-web, where we appear to be somehow restoring a non-latest version of Query.hs.
This commit is contained in:
		
							parent
							
								
									1087e790cf
								
							
						
					
					
						commit
						74fae2e1de
					
				
							
								
								
									
										14
									
								
								.github/workflows/linux.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.github/workflows/linux.yml
									
									
									
									
										vendored
									
									
								
							| @ -63,7 +63,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Cache stack global package db |     - name: Cache stack global package db | ||||||
|       id:   stack-global |       id:   stack-global | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: ~/.stack |         path: ~/.stack | ||||||
|         key: ${{ runner.os }}-stack-global-${{ matrix.plan.key }}-${{ hashFiles('**.yaml') }} |         key: ${{ runner.os }}-stack-global-${{ matrix.plan.key }}-${{ hashFiles('**.yaml') }} | ||||||
| @ -73,7 +73,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Cache stack-installed programs in ~/.local/bin |     - name: Cache stack-installed programs in ~/.local/bin | ||||||
|       id:   stack-programs |       id:   stack-programs | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: ~/.local/bin |         path: ~/.local/bin | ||||||
|         key: ${{ runner.os }}-stack-programs-${{ matrix.plan.key }}-${{ hashFiles('**.yaml') }} |         key: ${{ runner.os }}-stack-programs-${{ matrix.plan.key }}-${{ hashFiles('**.yaml') }} | ||||||
| @ -83,7 +83,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     # stack's local package dbs for the project and each package |     # stack's local package dbs for the project and each package | ||||||
|     - name: Cache .stack-work |     - name: Cache .stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: .stack-work |         path: .stack-work | ||||||
|         key: ${{ runner.os }}-stack-work-${{ matrix.plan.key }}-${{ hashFiles('**.yaml') }} |         key: ${{ runner.os }}-stack-work-${{ matrix.plan.key }}-${{ hashFiles('**.yaml') }} | ||||||
| @ -92,7 +92,7 @@ jobs: | |||||||
|           ${{ runner.os }}-stack-work |           ${{ runner.os }}-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-lib/.stack-work |     - name: Cache hledger-lib/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-lib/.stack-work |         path: hledger-lib/.stack-work | ||||||
|         key: ${{ runner.os }}-hledger-lib-stack-work-${{ matrix.plan.key }}-${{ hashFiles('hledger-lib/package.yaml') }} |         key: ${{ runner.os }}-hledger-lib-stack-work-${{ matrix.plan.key }}-${{ hashFiles('hledger-lib/package.yaml') }} | ||||||
| @ -101,7 +101,7 @@ jobs: | |||||||
|           ${{ runner.os }}-hledger-lib-stack-work |           ${{ runner.os }}-hledger-lib-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger/.stack-work |     - name: Cache hledger/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger/.stack-work |         path: hledger/.stack-work | ||||||
|         key: ${{ runner.os }}-hledger-stack-work-${{ matrix.plan.key }}-${{ hashFiles('hledger/package.yaml') }} |         key: ${{ runner.os }}-hledger-stack-work-${{ matrix.plan.key }}-${{ hashFiles('hledger/package.yaml') }} | ||||||
| @ -110,7 +110,7 @@ jobs: | |||||||
|           ${{ runner.os }}-hledger-stack-work |           ${{ runner.os }}-hledger-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-ui/.stack-work |     - name: Cache hledger-ui/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-ui/.stack-work |         path: hledger-ui/.stack-work | ||||||
|         key: ${{ runner.os }}-hledger-ui-stack-work-${{ matrix.plan.key }}-${{ hashFiles('hledger-ui/package.yaml') }} |         key: ${{ runner.os }}-hledger-ui-stack-work-${{ matrix.plan.key }}-${{ hashFiles('hledger-ui/package.yaml') }} | ||||||
| @ -119,7 +119,7 @@ jobs: | |||||||
|           ${{ runner.os }}-hledger-ui-stack-work |           ${{ runner.os }}-hledger-ui-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-web/.stack-work |     - name: Cache hledger-web/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-web/.stack-work |         path: hledger-web/.stack-work | ||||||
|         key: ${{ runner.os }}-hledger-web-stack-work-${{ matrix.plan.key }}-${{ hashFiles('hledger-web/package.yaml') }} |         key: ${{ runner.os }}-hledger-web-stack-work-${{ matrix.plan.key }}-${{ hashFiles('hledger-web/package.yaml') }} | ||||||
|  | |||||||
							
								
								
									
										14
									
								
								.github/workflows/mac.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.github/workflows/mac.yml
									
									
									
									
										vendored
									
									
								
							| @ -35,7 +35,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Cache stack global package db |     - name: Cache stack global package db | ||||||
|       id:   stack-global |       id:   stack-global | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: ~/.stack |         path: ~/.stack | ||||||
|         key:          ${{ runner.os }}-stack-global-${{ hashFiles('**.yaml') }} |         key:          ${{ runner.os }}-stack-global-${{ hashFiles('**.yaml') }} | ||||||
| @ -45,7 +45,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Cache stack-installed programs in ~/.local/bin |     - name: Cache stack-installed programs in ~/.local/bin | ||||||
|       id:   stack-programs |       id:   stack-programs | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: ~/.local/bin |         path: ~/.local/bin | ||||||
|         key:          ${{ runner.os }}-stack-programs-${{ hashFiles('**.yaml') }} |         key:          ${{ runner.os }}-stack-programs-${{ hashFiles('**.yaml') }} | ||||||
| @ -55,31 +55,31 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     # stack's local package dbs for the project and each package |     # stack's local package dbs for the project and each package | ||||||
|     - name: Cache .stack-work |     - name: Cache .stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: .stack-work |         path: .stack-work | ||||||
|         key: ${{ runner.os }}-stack-work |         key: ${{ runner.os }}-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-lib/.stack-work |     - name: Cache hledger-lib/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-lib/.stack-work |         path: hledger-lib/.stack-work | ||||||
|         key: ${{ runner.os }}-hledger-lib-stack-work |         key: ${{ runner.os }}-hledger-lib-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger/.stack-work |     - name: Cache hledger/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger/.stack-work |         path: hledger/.stack-work | ||||||
|         key: ${{ runner.os }}-hledger-stack-work |         key: ${{ runner.os }}-hledger-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-ui/.stack-work |     - name: Cache hledger-ui/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-ui/.stack-work |         path: hledger-ui/.stack-work | ||||||
|         key: ${{ runner.os }}-hledger-ui-stack-work |         key: ${{ runner.os }}-hledger-ui-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-web/.stack-work |     - name: Cache hledger-web/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-web/.stack-work |         path: hledger-web/.stack-work | ||||||
|         key: ${{ runner.os }}-hledger-web-stack-work |         key: ${{ runner.os }}-hledger-web-stack-work | ||||||
|  | |||||||
							
								
								
									
										14
									
								
								.github/workflows/push.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.github/workflows/push.yml
									
									
									
									
										vendored
									
									
								
							| @ -48,7 +48,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Cache stack global package db |     - name: Cache stack global package db | ||||||
|       id:   stack-global |       id:   stack-global | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: ~/.stack |         path: ~/.stack | ||||||
|         key:          ${{ runner.os }}-stack-global-${{ hashFiles('**.yaml') }} |         key:          ${{ runner.os }}-stack-global-${{ hashFiles('**.yaml') }} | ||||||
| @ -58,7 +58,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Cache stack-installed programs in ~/.local/bin |     - name: Cache stack-installed programs in ~/.local/bin | ||||||
|       id:   stack-programs |       id:   stack-programs | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: ~/.local/bin |         path: ~/.local/bin | ||||||
|         key:          ${{ runner.os }}-stack-programs-${{ hashFiles('**.yaml') }} |         key:          ${{ runner.os }}-stack-programs-${{ hashFiles('**.yaml') }} | ||||||
| @ -68,35 +68,35 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     # stack's local package dbs for the project and each package |     # stack's local package dbs for the project and each package | ||||||
|     - name: Cache .stack-work |     - name: Cache .stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: .stack-work |         path: .stack-work | ||||||
|         key:          ${{ runner.os }}-stack-work-${{ hashFiles('**.yaml') }} |         key:          ${{ runner.os }}-stack-work-${{ hashFiles('**.yaml') }} | ||||||
|         restore-keys: ${{ runner.os }}-stack-work |         restore-keys: ${{ runner.os }}-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-lib/.stack-work |     - name: Cache hledger-lib/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-lib/.stack-work |         path: hledger-lib/.stack-work | ||||||
|         key:          ${{ runner.os }}-hledger-lib-stack-work-${{ hashFiles('hledger-lib/package.yaml') }} |         key:          ${{ runner.os }}-hledger-lib-stack-work-${{ hashFiles('hledger-lib/package.yaml') }} | ||||||
|         restore-keys: ${{ runner.os }}-hledger-lib-stack-work |         restore-keys: ${{ runner.os }}-hledger-lib-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger/.stack-work |     - name: Cache hledger/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger/.stack-work |         path: hledger/.stack-work | ||||||
|         key:          ${{ runner.os }}-hledger-stack-work-${{ hashFiles('hledger/package.yaml') }} |         key:          ${{ runner.os }}-hledger-stack-work-${{ hashFiles('hledger/package.yaml') }} | ||||||
|         restore-keys: ${{ runner.os }}-hledger-stack-work |         restore-keys: ${{ runner.os }}-hledger-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-ui/.stack-work |     - name: Cache hledger-ui/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-ui/.stack-work |         path: hledger-ui/.stack-work | ||||||
|         key:          ${{ runner.os }}-hledger-ui-stack-work-${{ hashFiles('hledger-ui/package.yaml') }} |         key:          ${{ runner.os }}-hledger-ui-stack-work-${{ hashFiles('hledger-ui/package.yaml') }} | ||||||
|         restore-keys: ${{ runner.os }}-hledger-ui-stack-work |         restore-keys: ${{ runner.os }}-hledger-ui-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-web/.stack-work |     - name: Cache hledger-web/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-web/.stack-work |         path: hledger-web/.stack-work | ||||||
|         key:          ${{ runner.os }}-hledger-web-stack-work-${{ hashFiles('hledger-web/package.yaml') }} |         key:          ${{ runner.os }}-hledger-web-stack-work-${{ hashFiles('hledger-web/package.yaml') }} | ||||||
|  | |||||||
							
								
								
									
										14
									
								
								.github/workflows/windows.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								.github/workflows/windows.yml
									
									
									
									
										vendored
									
									
								
							| @ -36,7 +36,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Cache stack global package db |     - name: Cache stack global package db | ||||||
|       id:   stack-global-package-db |       id:   stack-global-package-db | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: C:\Users\runneradmin\AppData\Roaming\stack\ |         path: C:\Users\runneradmin\AppData\Roaming\stack\ | ||||||
|         key:          ${{ runner.os }}-appdata-roaming-stack-${{ hashFiles('**.yaml') }} |         key:          ${{ runner.os }}-appdata-roaming-stack-${{ hashFiles('**.yaml') }} | ||||||
| @ -49,7 +49,7 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     - name: Cache stack programs dir   # ghc, ghc-included packages and their haddocks, mingw, msys2 |     - name: Cache stack programs dir   # ghc, ghc-included packages and their haddocks, mingw, msys2 | ||||||
|       id:   stack-programs-dir |       id:   stack-programs-dir | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: C:\Users\runneradmin\AppData\Local\Programs\stack\ |         path: C:\Users\runneradmin\AppData\Local\Programs\stack\ | ||||||
|         # which files signal a change in stack's global db ? |         # which files signal a change in stack's global db ? | ||||||
| @ -64,35 +64,35 @@ jobs: | |||||||
| 
 | 
 | ||||||
|     # stack's local package dbs for the project and each package |     # stack's local package dbs for the project and each package | ||||||
|     - name: Cache .stack-work |     - name: Cache .stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: .stack-work |         path: .stack-work | ||||||
|         key:          ${{ runner.os }}-stack-work-${{ hashFiles('**.yaml') }} |         key:          ${{ runner.os }}-stack-work-${{ hashFiles('**.yaml') }} | ||||||
|         restore-keys: ${{ runner.os }}-stack-work |         restore-keys: ${{ runner.os }}-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-lib/.stack-work |     - name: Cache hledger-lib/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-lib/.stack-work |         path: hledger-lib/.stack-work | ||||||
|         key:          ${{ runner.os }}-hledger-lib-stack-work-${{ hashFiles('hledger-lib/package.yaml') }} |         key:          ${{ runner.os }}-hledger-lib-stack-work-${{ hashFiles('hledger-lib/package.yaml') }} | ||||||
|         restore-keys: ${{ runner.os }}-hledger-lib-stack-work |         restore-keys: ${{ runner.os }}-hledger-lib-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger/.stack-work |     - name: Cache hledger/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger/.stack-work |         path: hledger/.stack-work | ||||||
|         key:          ${{ runner.os }}-hledger-stack-work-${{ hashFiles('hledger/package.yaml') }} |         key:          ${{ runner.os }}-hledger-stack-work-${{ hashFiles('hledger/package.yaml') }} | ||||||
|         restore-keys: ${{ runner.os }}-hledger-stack-work |         restore-keys: ${{ runner.os }}-hledger-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-ui/.stack-work |     - name: Cache hledger-ui/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-ui/.stack-work |         path: hledger-ui/.stack-work | ||||||
|         key:          ${{ runner.os }}-hledger-ui-stack-work-${{ hashFiles('hledger-ui/package.yaml') }} |         key:          ${{ runner.os }}-hledger-ui-stack-work-${{ hashFiles('hledger-ui/package.yaml') }} | ||||||
|         restore-keys: ${{ runner.os }}-hledger-ui-stack-work |         restore-keys: ${{ runner.os }}-hledger-ui-stack-work | ||||||
| 
 | 
 | ||||||
|     - name: Cache hledger-web/.stack-work |     - name: Cache hledger-web/.stack-work | ||||||
|       uses: actions/cache@v1 |       uses: actions/cache@v2 | ||||||
|       with: |       with: | ||||||
|         path: hledger-web/.stack-work |         path: hledger-web/.stack-work | ||||||
|         key:          ${{ runner.os }}-hledger-web-stack-work-${{ hashFiles('hledger-web/package.yaml') }} |         key:          ${{ runner.os }}-hledger-web-stack-work-${{ hashFiles('hledger-web/package.yaml') }} | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user