From e6a7c5334b949541f0aabde1f0f66f5698266dbe Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Fri, 29 Aug 2025 11:10:08 +0200 Subject: [PATCH] Resiance in unpacking --- .github/workflows/build_osx.yml | 4 ++-- .github/workflows/build_rocky.yml | 4 ++-- .github/workflows/build_rocky_arm.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_osx.yml b/.github/workflows/build_osx.yml index 22a7d18c36..f8990a8188 100644 --- a/.github/workflows/build_osx.yml +++ b/.github/workflows/build_osx.yml @@ -51,8 +51,8 @@ jobs: - name: Unpack Dependencies run: | - install_root=$(find ./build -maxdepth 4 -name install) - find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; + install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true) + [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; - name: ccache uses: hendrikmuhs/ccache-action@v1 diff --git a/.github/workflows/build_rocky.yml b/.github/workflows/build_rocky.yml index 4b88f7e90b..fb429fa3eb 100644 --- a/.github/workflows/build_rocky.yml +++ b/.github/workflows/build_rocky.yml @@ -44,8 +44,8 @@ jobs: - name: Unpack Dependencies run: | - install_root=$(find ./build -maxdepth 4 -name install) - find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; + install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true) + [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; # Not supported on docker # - name: ccache diff --git a/.github/workflows/build_rocky_arm.yml b/.github/workflows/build_rocky_arm.yml index aa6c689ff9..54d7004ad6 100644 --- a/.github/workflows/build_rocky_arm.yml +++ b/.github/workflows/build_rocky_arm.yml @@ -44,8 +44,8 @@ jobs: - name: Unpack Dependencies run: | - install_root=$(find ./build -maxdepth 4 -name install) - [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; || true + install_root=$(find ./build -maxdepth 4 -type d -name install 2>/dev/null | head -n 1 || true) + [ -n "$install_root" ] && find "$install_root" -type f -name 'cache-*.tar.gz' -maxdepth 1 -exec tar -xzf {} -C "$install_root" \; # Not supported on docker # - name: ccache