From e90d13d57d6afe2b1653940aca326a95ade3ed8e Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Mon, 19 Jul 2021 10:24:45 +0200 Subject: [PATCH] GitHub CI: Cache SDKs path fix Seems like extracting from /var/tmp fails with cache action. --- .github/scripts/macOS/prepare.sh | 2 +- .github/scripts/macOS/prepare_free_sdks.sh | 6 +++--- .github/workflows/ccpp.yml | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index d303ecb82..416a949ff 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -28,7 +28,7 @@ mkdir $TEMP_INST cd $TEMP_INST # Install XIMEA (see /install.app/Contents/MacOS/install.sh) -hdiutil mount /var/tmp/sdks-free/XIMEA_OSX_SP.dmg +hdiutil mount $SDK_FREE_PATH/XIMEA_OSX_SP.dmg sudo cp -a /Volumes/XIMEA/m3api.framework $(xcrun --show-sdk-path)/System/Library/Frameworks sudo xattr -dr com.apple.quarantine $(xcrun --show-sdk-path)/System/Library/Frameworks umount /Volumes/XIMEA diff --git a/.github/scripts/macOS/prepare_free_sdks.sh b/.github/scripts/macOS/prepare_free_sdks.sh index f1ec8726d..82804cbf0 100755 --- a/.github/scripts/macOS/prepare_free_sdks.sh +++ b/.github/scripts/macOS/prepare_free_sdks.sh @@ -7,8 +7,8 @@ if [ $# -ge 1 ] && [ x$1 = x-e ]; then exit 0 fi -rm -rf /var/tmp/sdks-free -mkdir -p /var/tmp/sdks-free -cd /var/tmp/sdks-free +rm -rf $SDK_FREE_PATH +mkdir -p $SDK_FREE_PATH +cd $SDK_FREE_PATH curl -S -LO $XIMEA_DOWNLOAD_URL diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 6b9a369da..f1344dacd 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -140,7 +140,8 @@ jobs: needs: prepare runs-on: macos-latest env: - SDK_NONFREE_PATH: /var/tmp/sdks-nonfree + SDK_FREE_PATH: /private/var/tmp/sdks-free + SDK_NONFREE_PATH: /private/var/tmp/sdks-nonfree altool_credentials: ${{ secrets.altool_credentials }} apple_key_p12_b64: ${{ secrets.apple_key_p12_b64 }} SDK_URL: ${{ secrets.SDK_URL }} @@ -170,7 +171,7 @@ jobs: id: cache-macos-free-sdks uses: actions/cache@v2 with: - path: '/var/tmp/sdks-free' + path: ${{ env.SDK_FREE_PATH }} key: cache-free-sdks-${{ runner.os }}-${{ hashFiles('.github/scripts/macOS/prepare_free_sdks.sh') }}-${{ steps.etags.outputs.free }} - name: Download Free SDKs if: steps.cache-macos-free-sdks.outputs.cache-hit != 'true'