ci: handle ccache / depends based on build_target not host to avoid failing to cache all the linux 86_64 runs

This commit is contained in:
pasta 2024-10-24 22:47:19 -05:00
parent cbeeb9e00d
commit 189233b987
No known key found for this signature in database
GPG Key ID: E2F3D7916E722D38

View File

@ -107,10 +107,10 @@ jobs:
path: | path: |
depends/${{ matrix.host }} depends/${{ matrix.host }}
# We don't care about no specific key as depends system will handle that for us # We don't care about no specific key as depends system will handle that for us
key: ${{ runner.os }}-depends-${{ matrix.host }}-${{ hashFiles('depends/packages/*') }} key: ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
restore-keys: | restore-keys: |
${{ runner.os }}-depends-${{ matrix.host }}-${{ hashFiles('depends/packages/*') }} ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
${{ runner.os }}-depends-${{ matrix.host }} ${{ runner.os }}-depends-${{ matrix.build_target }}
- name: Build dependencies - name: Build dependencies
run: make -j$(nproc) -C depends HOST=${{ matrix.host }} run: make -j$(nproc) -C depends HOST=${{ matrix.host }}
@ -154,10 +154,10 @@ jobs:
with: with:
path: | path: |
depends/${{ matrix.host }} depends/${{ matrix.host }}
key: ${{ runner.os }}-depends-${{ matrix.host }}-${{ hashFiles('depends/packages/*') }} key: ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
restore-keys: | restore-keys: |
${{ runner.os }}-depends-${{ matrix.host }}-${{ hashFiles('depends/packages/*') }} ${{ runner.os }}-depends-${{ matrix.build_target }}-${{ hashFiles('depends/packages/*') }}
${{ runner.os }}-depends-${{ matrix.host }} ${{ runner.os }}-depends-${{ matrix.build_target }}
- name: Determine PR Base SHA - name: Determine PR Base SHA
id: vars id: vars
@ -169,11 +169,11 @@ jobs:
with: with:
path: | path: |
/cache /cache
key: ${{ runner.os }}-${{ matrix.host }}-${{ github.sha }} key: ${{ runner.os }}-${{ matrix.build_target }}-${{ github.sha }}
restore-keys: | restore-keys: |
${{ runner.os }}-${{ matrix.host }}-${{ github.sha }} ${{ runner.os }}-${{ matrix.build_target }}-${{ github.sha }}
${{ runner.os }}-${{ matrix.host }}-${{ steps.vars.outputs.PR_BASE_SHA }} ${{ runner.os }}-${{ matrix.build_target }}-${{ steps.vars.outputs.PR_BASE_SHA }}
${{ runner.os }}-${{ matrix.host }} ${{ runner.os }}-${{ matrix.build_target }}
- name: Build source and run tests - name: Build source and run tests
run: | run: |