Restore the cache before installing packages. (#3023)
This is useful in case packages are part of the cache.
diff --git a/.github/actions/setup-linux/action.yml b/.github/actions/setup-linux/action.yml
index dfb66c2..7d12c9e 100644
--- a/.github/actions/setup-linux/action.yml
+++ b/.github/actions/setup-linux/action.yml
@@ -68,18 +68,18 @@
run: sudo apt install -y libgtest-dev
shell: bash
- - uses: ./.github/actions/setup-common
- with:
- codec-aom: ${{ inputs.codec-aom }}
- codec-dav1d: ${{ inputs.codec-dav1d }}
- codec-rav1e: ${{ inputs.codec-rav1e }}
- oldest-cmake: ${{ inputs.oldest-cmake }}
- uses: ./.github/actions/cache
id: cache
with:
extra-key: ${{ inputs.extra-cache-key }}
use-meson: ${{ inputs.codec-dav1d == 'LOCAL' }}
use-rust: ${{ inputs.codec-rav1e == 'LOCAL' }}
+ - uses: ./.github/actions/setup-common
+ with:
+ codec-aom: ${{ inputs.codec-aom }}
+ codec-dav1d: ${{ inputs.codec-dav1d }}
+ codec-rav1e: ${{ inputs.codec-rav1e }}
+ oldest-cmake: ${{ inputs.oldest-cmake }}
- name: Set GCC & G++ compiler
if: ${{ inputs.gcc-version != '' }}
diff --git a/.github/actions/setup-macos/action.yml b/.github/actions/setup-macos/action.yml
index 354fcfe..5f103e2 100644
--- a/.github/actions/setup-macos/action.yml
+++ b/.github/actions/setup-macos/action.yml
@@ -54,14 +54,14 @@
run: brew install googletest
shell: bash
- - uses: ./.github/actions/setup-common
- with:
- codec-aom: ${{ inputs.codec-aom }}
- codec-dav1d: ${{ inputs.codec-dav1d }}
- codec-rav1e: ${{ inputs.codec-rav1e }}
- uses: ./.github/actions/cache
id: cache
with:
extra-key: ${{ inputs.extra-cache-key }}
use-meson: ${{ inputs.codec-dav1d == 'LOCAL' }}
use-rust: ${{ inputs.codec-rav1e == 'LOCAL' }}
+ - uses: ./.github/actions/setup-common
+ with:
+ codec-aom: ${{ inputs.codec-aom }}
+ codec-dav1d: ${{ inputs.codec-dav1d }}
+ codec-rav1e: ${{ inputs.codec-rav1e }}
diff --git a/.github/actions/setup-windows/action.yml b/.github/actions/setup-windows/action.yml
index d6ac2a1..6dcd576 100644
--- a/.github/actions/setup-windows/action.yml
+++ b/.github/actions/setup-windows/action.yml
@@ -98,14 +98,14 @@
mv ${{ github.workspace }}\tmp\rav1e-windows-msvc-sdk\lib\pkgconfig\* ${{ github.workspace }}\vcpkg\installed\x64-windows-release\lib\pkgconfig
shell: pwsh
- - uses: ./.github/actions/setup-common
- with:
- codec-aom: ${{ inputs.codec-aom }}
- codec-dav1d: ${{ inputs.codec-dav1d }}
- codec-rav1e: ${{ inputs.codec-rav1e }}
- uses: ./.github/actions/cache
id: cache
with:
extra-key: ${{ inputs.extra-cache-key }}
use-meson: ${{ inputs.codec-dav1d == 'LOCAL' }}
use-rust: ${{ inputs.codec-rav1e == 'LOCAL' }}
+ - uses: ./.github/actions/setup-common
+ with:
+ codec-aom: ${{ inputs.codec-aom }}
+ codec-dav1d: ${{ inputs.codec-dav1d }}
+ codec-rav1e: ${{ inputs.codec-rav1e }}