From c0373e4557694675252c35ef11ee064e12e68aac Mon Sep 17 00:00:00 2001 From: zyphlar Date: Mon, 12 Jan 2026 16:53:02 -0800 Subject: [PATCH] [ci] Cache .git/modules with submodules for proper restoration Signed-off-by: zyphlar --- .forgejo/workflows/android-check.yaml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/android-check.yaml b/.forgejo/workflows/android-check.yaml index f408c745b..4f220203d 100644 --- a/.forgejo/workflows/android-check.yaml +++ b/.forgejo/workflows/android-check.yaml @@ -97,6 +97,7 @@ jobs: - uses: actions/cache@v4 with: path: | + .git/modules 3party/CMake-MetalShaderSupport 3party/Vulkan-Headers 3party/boost @@ -119,11 +120,15 @@ jobs: 3party/utfcpp tools/kothic tools/osmctools - key: submodules-cache-${{ steps.date.outputs.date }} + key: submodules-${{ hashFiles('.gitmodules') }} + restore-keys: | + submodules- - - name: Parallel submodules checkout + - name: Sync and update submodules shell: bash - run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20)) + run: | + git submodule sync --recursive + git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20)) - name: Lint shell: bash @@ -207,6 +212,7 @@ jobs: - uses: actions/cache@v4 with: path: | + .git/modules 3party/CMake-MetalShaderSupport 3party/Vulkan-Headers 3party/boost @@ -229,11 +235,15 @@ jobs: 3party/utfcpp tools/kothic tools/osmctools - key: submodules-cache-${{ steps.date.outputs.date }} + key: submodules-${{ hashFiles('.gitmodules') }} + restore-keys: | + submodules- - - name: Parallel submodules checkout + - name: Sync and update submodules shell: bash - run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20)) + run: | + git submodule sync --recursive + git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20)) - name: Configure ccache uses: https://github.com/hendrikmuhs/ccache-action@v1.2