take advantage of cache scoping rules to simplify names

develop
Myk Taylor 2023-07-28 16:58:23 -07:00
parent 73427de994
commit c67e0da250
No known key found for this signature in database
1 changed files with 3 additions and 6 deletions

@ -53,9 +53,8 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.ref_name }}-${{ github.sha }} key: ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.sha }}
restore-keys: | restore-keys: |
ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}-${{ github.ref_name }}
ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }} ccache-${{ matrix.os }}-gcc-${{ matrix.gcc }}
# - name: Fetch DF cache # - name: Fetch DF cache
# uses: actions/cache@v3 # uses: actions/cache@v3
@ -147,9 +146,8 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: ~/.ccache path: ~/.ccache
key: ccache-ubuntu-22.04-gcc-10-${{ github.ref_name }}-${{ github.sha }} key: ccache-ubuntu-22.04-gcc-10-${{ github.sha }}
restore-keys: | restore-keys: |
ccache-ubuntu-22.04-gcc-10-${{ github.ref_name }}
ccache-ubuntu-22.04-gcc-10 ccache-ubuntu-22.04-gcc-10
- name: Set up environment - name: Set up environment
id: env_setup id: env_setup
@ -202,9 +200,8 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
path: build/win64-cross/ccache path: build/win64-cross/ccache
key: ccache-win64-cross-msvc-${{ github.ref_name }}-${{ github.sha }} key: ccache-win64-cross-msvc-${{ github.sha }}
restore-keys: | restore-keys: |
ccache-win64-cross-msvc-${{ github.ref_name }}
ccache-win64-cross-msvc ccache-win64-cross-msvc
- name: Cross-compile win64 - name: Cross-compile win64
env: env: