diff --git a/.github/scripts/macOS/prepare.sh b/.github/scripts/macOS/prepare.sh index 68f961b9b..aa5a51710 100755 --- a/.github/scripts/macOS/prepare.sh +++ b/.github/scripts/macOS/prepare.sh @@ -1,4 +1,4 @@ -#!/bin/bash -eu +#!/bin/bash -eux AJA_INST=/var/tmp/ntv2sdk # AJA installation directory TEMP_INST=/tmp/install @@ -25,10 +25,11 @@ brew install qt mkdir $TEMP_INST cd $TEMP_INST -# Install XIMEA -if [ -f /var/tmp/sdks/m3api.tar.xz ]; then - sudo tar xJf /var/tmp/sdks/m3api.tar.xz -C $(xcrun --show-sdk-path)/System/Library/Frameworks -fi +# Install XIMEA (see /install.app/Contents/MacOS/install.sh) +hdiutil mount /var/tmp/sdks-free/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 # Install AJA if [ -f /var/tmp/sdks/ntv2sdkmac.zip ]; then diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index ad9112bf7..e1fe5f393 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -145,7 +145,18 @@ jobs: if: steps.cache-macos-sdk.outputs.cache-hit != 'true' && env.SDK_URL != null run: | mkdir /var/tmp/sdks && cd /var/tmp/sdks - curl -S -O $SDK_URL/m3api.tar.xz -O $SDK_URL/ntv2sdkmac.zip -O $SDK_URL/VideoMasterHD_mac.tar.xz -O $SDK_URL/NDISDK_Apple.pkg + curl -S -O $SDK_URL/ntv2sdkmac.zip -O $SDK_URL/VideoMasterHD_mac.tar.xz -O $SDK_URL/NDISDK_Apple.pkg + - name: Cache Free SDKs + id: cache-macos-free-sdks + uses: actions/cache@v1 + with: + path: '/var/tmp/free-sdks' + key: cache-macos-free-sdks + - name: Download Free SDKs + if: steps.cache-macos-free-sdk.outputs.cache-hit != 'true' + run: | + mkdir /var/tmp/sdks-free && cd /var/tmp/sdks-free + curl -S -LO https://www.ximea.com/downloads/recent/XIMEA_OSX_SP.dmg - name: bootstrap run: | . .github/scripts/environment.sh