CI: Remove always-true conditions from cache actions
After 80517124a4, we must always provide
these paths now.
This commit is contained in:
parent
cb852a7e19
commit
a2fc4c1e10
2 changed files with 2 additions and 8 deletions
6
.github/actions/cache-restore/action.yml
vendored
6
.github/actions/cache-restore/action.yml
vendored
|
|
@ -42,7 +42,6 @@ runs:
|
|||
- name: 'Compiler Cache'
|
||||
uses: actions/cache/restore@v4
|
||||
id: 'ccache'
|
||||
if: ${{ inputs.ccache_path != '' }}
|
||||
with:
|
||||
path: ${{ inputs.ccache_path }}
|
||||
key: '"ccache" | "${{ inputs.os }}" | "${{ inputs.arch }}" | "${{ inputs.toolchain }}" | "${{ inputs.cache_key_extra }}" | ${{ steps.date-stamp.outputs.timestamp }}'
|
||||
|
|
@ -50,7 +49,7 @@ runs:
|
|||
"ccache" | "${{ inputs.os }}" | "${{ inputs.arch }}" | "${{ inputs.toolchain }}" | "${{ inputs.cache_key_extra }}"
|
||||
|
||||
- name: 'Configure Compiler Cache'
|
||||
if: ${{ inputs.os != 'Windows' && inputs.ccache_path != '' }}
|
||||
if: ${{ inputs.os != 'Windows' }}
|
||||
shell: bash
|
||||
env:
|
||||
CCACHE_DIR: ${{ inputs.ccache_path }}
|
||||
|
|
@ -64,7 +63,7 @@ runs:
|
|||
ccache -z
|
||||
|
||||
- name: 'Configure Compiler Cache (Windows)'
|
||||
if: ${{ inputs.os == 'Windows' && inputs.ccache_path != '' }}
|
||||
if: ${{ inputs.os == 'Windows' }}
|
||||
shell: pwsh
|
||||
env:
|
||||
CCACHE_DIR: ${{ inputs.ccache_path }}
|
||||
|
|
@ -82,7 +81,6 @@ runs:
|
|||
|
||||
- name: 'Restore vcpkg cache'
|
||||
uses: actions/cache/restore@v4
|
||||
if: ${{ inputs.vcpkg_cache_path != '' }}
|
||||
id: 'vcpkg'
|
||||
with:
|
||||
path: ${{ inputs.vcpkg_cache_path }}
|
||||
|
|
|
|||
4
.github/actions/cache-save/action.yml
vendored
4
.github/actions/cache-save/action.yml
vendored
|
|
@ -26,13 +26,11 @@ runs:
|
|||
shell: bash
|
||||
env:
|
||||
CCACHE_DIR: ${{ inputs.ccache_path }}
|
||||
if: ${{ inputs.ccache_path != '' }}
|
||||
run: |
|
||||
ccache --evict-older-than=1d
|
||||
|
||||
- name: 'Compiler Cache'
|
||||
uses: actions/cache/save@v4
|
||||
if: ${{ inputs.ccache_path != '' }}
|
||||
with:
|
||||
path: ${{ inputs.ccache_path }}
|
||||
key: ${{ inputs.ccache_primary_key }}
|
||||
|
|
@ -41,13 +39,11 @@ runs:
|
|||
shell: bash
|
||||
env:
|
||||
CCACHE_DIR: ${{ inputs.ccache_path }}
|
||||
if: ${{ inputs.ccache_path != '' }}
|
||||
run: |
|
||||
ccache -s
|
||||
|
||||
- name: 'vcpkg binary cache'
|
||||
uses: actions/cache/save@v4
|
||||
if: ${{ inputs.vcpkg_cache_path != '' }}
|
||||
with:
|
||||
path: ${{ inputs.vcpkg_cache_path }}
|
||||
key: ${{ inputs.vcpkg_cache_primary_key }}
|
||||
|
|
|
|||
Loading…
Reference in a new issue