diff --git a/.github/actions/cache-restore/action.yml b/.github/actions/cache-restore/action.yml index c0fd694af6..a0ceec9e47 100644 --- a/.github/actions/cache-restore/action.yml +++ b/.github/actions/cache-restore/action.yml @@ -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 }} diff --git a/.github/actions/cache-save/action.yml b/.github/actions/cache-save/action.yml index 93f45d42c8..fac418e69b 100644 --- a/.github/actions/cache-save/action.yml +++ b/.github/actions/cache-save/action.yml @@ -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 }}