refactor: simplify caching setup, add a restore key to actually cache besides 1 run

This commit is contained in:
pasta 2024-08-01 14:27:01 -05:00
parent 1b139e4837
commit 101a31555f
No known key found for this signature in database
GPG Key ID: 52527BEDABE87984

View File

@ -46,16 +46,21 @@ jobs:
cache-from: type=gha cache-from: type=gha
cache-to: type=gha,mode=max cache-to: type=gha,mode=max
- name: Restore Guix cache and depends - name: Cache Guix and depends
id: guix-cache-restore id: guix-cache-restore
uses: actions/cache/restore@v3 uses: actions/cache@v3
with: with:
path: | path: |
${{ github.workspace }}/.cache ${{ github.workspace }}/.cache
${{ github.workspace }}/dash/depends/built ${{ github.workspace }}/dash/depends/built
${{ github.workspace }}/dash/depends/sources ${{ github.workspace }}/dash/depends/sources
${{ github.workspace }}/dash/depends/work ${{ github.workspace }}/dash/depends/work
key: ${{ runner.os }}-guix key: ${{ runner.os }}-guix-${{ github.event.pull_request.head.sha }}
restore-keys: |
${{ runner.os }}-guix-${{ github.event.pull_request.head.sha }}
${{ runner.os }}-guix-
- name: Create .cache folder if missing - name: Create .cache folder if missing
if: steps.guix-cache-restore.outputs.cache-hit != 'true' if: steps.guix-cache-restore.outputs.cache-hit != 'true'
@ -80,17 +85,6 @@ jobs:
exit 1 exit 1
fi fi
- name: Save Guix cache and depends
id: guix-cache-save
uses: actions/cache/save@v3
with:
path: |
${{ github.workspace }}/.cache
${{ github.workspace }}/dash/depends/built
${{ github.workspace }}/dash/depends/sources
${{ github.workspace }}/dash/depends/work
key: ${{ steps.guix-cache-restore.outputs.cache-primary-key }}
- name: Compute SHA256 checksums - name: Compute SHA256 checksums
run: | run: |
./dash/contrib/containers/guix/scripts/guix-check ${{ github.workspace }}/dash ./dash/contrib/containers/guix/scripts/guix-check ${{ github.workspace }}/dash