Skip to content

Commit

Permalink
CI macos: re-enable DELTACAST
Browse files Browse the repository at this point in the history
The file name has changed and --enable-deltacast was used just if the
download succeeded (which didn't).
  • Loading branch information
MartinPulec committed Oct 24, 2024
1 parent 4d73989 commit 1fd1993
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/scripts/environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,5 @@ import_signing_key() {
}
import_signing_key

printf '%b' 'DELTA_MAC_ARCHIVE=videomaster-macos-dev.zip\n' >> "$GITHUB_ENV"

5 changes: 2 additions & 3 deletions .github/scripts/macOS/install_others.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@ install_ximea() {(
)}

install_deltacast() {
filename=videomaster-macos-dev.zip
if [ ! -f "$SDK_NONFREE_PATH/$filename" ]; then
if [ ! -f "$SDK_NONFREE_PATH/$DELTA_MAC_ARCHIVE" ]; then
return
fi
unzip "$SDK_NONFREE_PATH/$filename"
unzip "$SDK_NONFREE_PATH/$DELTA_MAC_ARCHIVE"
sudo cp -a Frameworks/VideoMasterHD* /Library/Frameworks/
export FEATURES="${FEATURES+$FEATURES }--enable-deltacast"
echo "FEATURES=$FEATURES" >> "$GITHUB_ENV"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ jobs:
- name: Fetch SDKs ETags
id: etags
run: |
echo "nonfree=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh $SDK_URL/VideoMaster_SDK_MacOSX.zip)" >> $GITHUB_OUTPUT
echo "nonfree=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh "$SDK_URL/$DELTA_MAC_ARCHIVE")" >> $GITHUB_OUTPUT
echo "ndi=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh https://downloads.ndi.tv/SDK/NDI_SDK_Mac/Install_NDI_SDK_v6_Apple.pkg)" >> $GITHUB_OUTPUT
echo "ximea=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh https://www.ximea.com/downloads/recent/XIMEA_OSX_SP.dmg)" >> $GITHUB_OUTPUT
- name: Set environment
Expand All @@ -159,14 +159,14 @@ jobs:
uses: actions/cache@main
with:
path: ${{ env.SDK_NONFREE_PATH }}
key: cache-nonfree-sdks-${{ runner.os }}-${{ hashFiles('.github/scripts/macOS/prepare_nonfree_sdks.sh') }}-${{ steps.etags.outputs.nonfree }}
key: cache-nonfree-sdks-${{ runner.os }}-${{ steps.etags.outputs.nonfree }}
- name: Download Non-Free SDKs
if: steps.cache-macos-nonfree-sdks.outputs.cache-hit != 'true' && env.SDK_URL != null
run: |
rm -rf ${{ env.SDK_NONFREE_PATH }}
mkdir -p ${{ env.SDK_NONFREE_PATH }}
cd ${{ env.SDK_NONFREE_PATH }}
curl -S -f -O $SDK_URL/VideoMaster_SDK_MacOSX.zip || true
curl -S -f -O "$SDK_URL/$DELTA_MAC_ARCHIVE" || true
- name: Cache XIMEA
id: cache-macos-ximea
uses: actions/cache@main
Expand Down

0 comments on commit 1fd1993

Please sign in to comment.