From b6adea2b626475480ef0bba484fde87cf4497d3f Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Tue, 27 Apr 2021 13:55:12 +0200
Subject: [PATCH] GitHub CI [Mac]: don't require all non-free SDKs

Do not require all of the non-free SDKs to be present. User may opt in
only for one (and doesn't own the other, either).
---
 .github/scripts/macOS/prepare_nonfree_sdks.sh | 39 ++++++++++---------
 .github/workflows/ccpp.yml                    |  2 +-
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/scripts/macOS/prepare_nonfree_sdks.sh b/.github/scripts/macOS/prepare_nonfree_sdks.sh
index 66d618050..96ead83c1 100755
--- a/.github/scripts/macOS/prepare_nonfree_sdks.sh
+++ b/.github/scripts/macOS/prepare_nonfree_sdks.sh
@@ -4,24 +4,27 @@ cd /tmp
 
 # AJA
 AJA_DIRECTORY=$SDK_NONFREE_PATH/ntv2sdk
-unzip $SDK_NONFREE_PATH/ntv2sdkmac.zip
-mv /tmp/ntv2sdk* $AJA_DIRECTORY
-cd $AJA_DIRECTORY/ajalibraries/ajantv2/build
-xcodebuild -project ajantv2.xcodeproj
+if [ -f $SDK_NONFREE_PATH/ntv2sdkmac.zip ]; then
+        mv /tmp/ntv2sdk* $AJA_DIRECTORY
+        cd $AJA_DIRECTORY/ajalibraries/ajantv2/build
+        xcodebuild -project ajantv2.xcodeproj
+fi
 
 # DELTACAST
 DELTA_CACHE_INST=$SDK_NONFREE_PATH/VideoMasterHD_inst
-unzip /var/tmp/sdks-nonfree/VideoMaster_SDK_MacOSX.zip
-sudo installer -pkg VideoMaster_SDK.pkg -target /
-cd /Library/Frameworks
-sudo install_name_tool -change /Library/Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD
-sudo install_name_tool -id @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD
-sudo install_name_tool -change /Library/Frameworks/libVideoMasterHD_SP.dylib @executable_path/../Frameworks/libVideoMasterHD_SP.dylib /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD
-sudo install_name_tool -id @executable_path/../Frameworks/libVideoMasterHD_SP.dylib /Library/Frameworks/libVideoMasterHD_SP.dylib
-sudo install_name_tool -id @executable_path/../Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio /Library/Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio
-sudo install_name_tool -change /Library/Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio
-#sudo cp -a VideoMasterHD.framework VideoMasterHD_Audio.framework libVideoMasterHD_SP.dylib $(xcrun --show-sdk-path)/System/Library/Frameworks
-mkdir $DELTA_CACHE_INST
-sudo cp -a VideoMasterHD.framework VideoMasterHD_Audio.framework libVideoMasterHD_SP.dylib $DELTA_CACHE_INST
-cd -
-sudo rm -rf /Library/Frameworks/VideoMasterHD* # ensure that only the copy above is used
+if [ -f $SDK_NONFREE_PATH/VideoMaster_SDK_MacOSX.zip ]; then
+        unzip $SDK_NONFREE_PATH/VideoMaster_SDK_MacOSX.zip
+        sudo installer -pkg VideoMaster_SDK.pkg -target /
+        cd /Library/Frameworks
+        sudo install_name_tool -change /Library/Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD
+        sudo install_name_tool -id @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD
+        sudo install_name_tool -change /Library/Frameworks/libVideoMasterHD_SP.dylib @executable_path/../Frameworks/libVideoMasterHD_SP.dylib /Library/Frameworks/VideoMasterHD.framework/VideoMasterHD
+        sudo install_name_tool -id @executable_path/../Frameworks/libVideoMasterHD_SP.dylib /Library/Frameworks/libVideoMasterHD_SP.dylib
+        sudo install_name_tool -id @executable_path/../Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio /Library/Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio
+        sudo install_name_tool -change /Library/Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD @executable_path/../Frameworks/VideoMasterHD.framework/Versions/A/VideoMasterHD /Library/Frameworks/VideoMasterHD_Audio.framework/Versions/A/VideoMasterHD_Audio
+        #sudo cp -a VideoMasterHD.framework VideoMasterHD_Audio.framework libVideoMasterHD_SP.dylib $(xcrun --show-sdk-path)/System/Library/Frameworks
+        mkdir $DELTA_CACHE_INST
+        sudo cp -a VideoMasterHD.framework VideoMasterHD_Audio.framework libVideoMasterHD_SP.dylib $DELTA_CACHE_INST
+        cd -
+        sudo rm -rf /Library/Frameworks/VideoMasterHD* # ensure that only the copy above is used
+fi
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 5bfc3b6ca..6a7a2890a 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -153,7 +153,7 @@ jobs:
       if: steps.cache-macos-nonfree-sdks.outputs.cache-hit != 'true' && env.SDK_URL != null
       run: |
         mkdir ${{ env.SDK_NONFREE_PATH }} && cd ${{ env.SDK_NONFREE_PATH }}
-        curl -S -O $SDK_URL/ntv2sdkmac.zip -O $SDK_URL/VideoMaster_SDK_MacOSX.zip -O $SDK_URL/NDISDK_Apple.pkg
+        curl -S -f -O $SDK_URL/ntv2sdkmac.zip --next -f -O $SDK_URL/VideoMaster_SDK_MacOSX.zip --next -f -O $SDK_URL/NDISDK_Apple.pkg || true
         $GITHUB_WORKSPACE/.github/scripts/macOS/prepare_nonfree_sdks.sh
     - name: Cache Free SDKs
       id: cache-macos-free-sdks