Fix more caching (#2996)
* Revert "Cache installed vcpkg libraries in the CI (#2995)"
The cache is actually 1G big ...
This reverts commit a209fd82800d3c585086798ad59645a427b3265b.
* Reduce when the Rust cache is refreshed
diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
index 5761559..3acd163 100644
--- a/.github/actions/cache/action.yml
+++ b/.github/actions/cache/action.yml
@@ -10,9 +10,6 @@
use-rust:
description: "Whether rust is used"
default: false
- vcpkg-libraries:
- description: "List of libraries installed by vcpkg"
- default: ''
outputs:
ext-cache-hit:
value: ${{ steps.cache-ext.outputs.cache-hit }}
@@ -44,7 +41,7 @@
- name: Generate cargo cache key
if: ${{ inputs.use-rust == 'true' }}
run: |
- echo "CARGO_KEY=cargo-`cargo --version|cut -d' ' -f2`-${{ hashFiles('.github/actions/**/*', steps.workflow-info.outputs.path, 'CMakeLists.txt', 'cmake/Modules/Findrav1e.cmake', 'cmake/Modules/LocalRav1e.cmake', 'ext/rav1e.cmd') }}" >> $GITHUB_ENV
+ echo "CARGO_KEY=cargo-`cargo --version|cut -d' ' -f2`-${{ hashFiles('.github/actions/setup-common/action.yml', steps.workflow-info.outputs.path, 'cmake/Modules/Findrav1e.cmake', 'cmake/Modules/LocalRav1e.cmake', 'ext/rav1e.cmd') }}" >> $GITHUB_ENV
shell: bash
- name: Generate empty cargo cache key
if: ${{ inputs.use-rust != 'true' }}
@@ -74,9 +71,3 @@
with:
path: build/_deps
key: deps-${{ runner.os }}-${{ runner.arch }}-${{ github.job }}-${{ inputs.extra-key }}-${{ env.CARGO_KEY }}-${{ env.MESON_KEY }}-${{ hashFiles('.github/actions/**/*', steps.workflow-info.outputs.path, 'CMakeLists.txt', 'cmake/Modules/*') }}
- - name: Cache installed vcpkg packages
- if: ${{ inputs.vcpkg-libraries != '' }}
- uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
- with:
- path: ${{ github.workspace }}\vcpkg
- key: vcpkg-${{ runner.arch }}-${{ inputs.vcpkg-libraries }}-${{ hashFiles('.github/actions/setup-windows/*', '.github/workflows/ci-windows*') }}
diff --git a/.github/actions/setup-windows/action.yml b/.github/actions/setup-windows/action.yml
index f6e4cd2..d6ac2a1 100644
--- a/.github/actions/setup-windows/action.yml
+++ b/.github/actions/setup-windows/action.yml
@@ -109,4 +109,3 @@
extra-key: ${{ inputs.extra-cache-key }}
use-meson: ${{ inputs.codec-dav1d == 'LOCAL' }}
use-rust: ${{ inputs.codec-rav1e == 'LOCAL' }}
- vcpkg-libraries: ${{ env.AVIF_WIN_LIBRARIES }}