Skip to content

Commit 09ff922

Browse files
committed
CI macos: re-enable DELTACAST
The file name has changed and --enable-deltacast was used just if the download succeeded (which didn't). Fixes the commit 98d4969 (2024-05-24) that disabled deltacast, because the archive was not downloaded due to wrong name.
1 parent b3ec13a commit 09ff922

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/scripts/environment.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,5 @@ import_signing_key() {
120120
}
121121
import_signing_key
122122

123+
printf '%b' 'DELTA_MAC_ARCHIVE=videomaster-macos-dev.tar.gz\n' >> "$GITHUB_ENV"
124+

.github/scripts/macOS/install_others.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ install_aja() {(
3838
)}
3939

4040
install_deltacast() {
41-
filename=videomaster-macos-dev.zip
42-
if [ ! -f "$SDK_NONFREE_PATH/$filename" ]; then
41+
if [ ! -f "$SDK_NONFREE_PATH/$DELTA_MAC_ARCHIVE" ]; then
4342
return
4443
fi
45-
unzip "$SDK_NONFREE_PATH/$filename"
46-
sudo cp -a Frameworks/VideoMasterHD* /Library/Frameworks/
44+
tar xzf "$SDK_NONFREE_PATH/$DELTA_MAC_ARCHIVE"
45+
sudo cp -a Deltacast/Library/Frameworks/VideoMasterHD* \
46+
/Library/Frameworks/
4747
export FEATURES="${FEATURES+$FEATURES }--enable-deltacast"
4848
echo "FEATURES=$FEATURES" >> "$GITHUB_ENV"
4949
export COMMON_OSX_FLAGS="${COMMON_OSX_FLAGS+$COMMON_OSX_FLAGS }\

.github/workflows/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Further subsection briefly describe individual assets and how to obtain them. A
2626
are unmodified files downloaded from vendor website. However, rename may be required.
2727

2828
### macOS
29-
- **VideoMaster\_SDK\_MacOSX.zip** - VideoMaster SDK for Mac from
29+
- **videomaster-macos-dev.tar.gz** - VideoMaster SDK for Mac from
3030
[DELTACAST](https://www.deltacast.tv/support/download-center)
3131

3232
### Windows

.github/workflows/ccpp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
- name: Fetch SDKs ETags
150150
id: etags
151151
run: |
152-
echo "nonfree=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh $SDK_URL/VideoMaster_SDK_MacOSX.zip)" >> $GITHUB_OUTPUT
152+
echo "nonfree=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh "$SDK_URL/$DELTA_MAC_ARCHIVE")" >> $GITHUB_OUTPUT
153153
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
154154
echo "ximea=$($GITHUB_WORKSPACE/.github/scripts/get-etags.sh https://www.ximea.com/downloads/recent/XIMEA_OSX_SP.dmg)" >> $GITHUB_OUTPUT
155155
- name: Set environment
@@ -159,14 +159,14 @@ jobs:
159159
uses: actions/cache@main
160160
with:
161161
path: ${{ env.SDK_NONFREE_PATH }}
162-
key: cache-nonfree-sdks-${{ runner.os }}-${{ hashFiles('.github/scripts/macOS/prepare_nonfree_sdks.sh') }}-${{ steps.etags.outputs.nonfree }}
162+
key: cache-nonfree-sdks-${{ runner.os }}-${{ steps.etags.outputs.nonfree }}
163163
- name: Download Non-Free SDKs
164164
if: steps.cache-macos-nonfree-sdks.outputs.cache-hit != 'true' && env.SDK_URL != null
165165
run: |
166166
rm -rf ${{ env.SDK_NONFREE_PATH }}
167167
mkdir -p ${{ env.SDK_NONFREE_PATH }}
168168
cd ${{ env.SDK_NONFREE_PATH }}
169-
curl -S -f -O $SDK_URL/VideoMaster_SDK_MacOSX.zip || true
169+
curl -S -f -O "$SDK_URL/$DELTA_MAC_ARCHIVE" || true
170170
- name: Cache XIMEA
171171
id: cache-macos-ximea
172172
uses: actions/cache@main

0 commit comments

Comments
 (0)