From 3a076d2482901e2f09220df525f9250e2b6832ed Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 8 Feb 2024 15:57:53 +0100 Subject: [PATCH] CI mac arm64: disable cineform+Deltacast - cineform seems to be unsupported altogether - Deltacast should work but it doesn't seem so --- .github/scripts/environment.sh | 6 +++++- .github/scripts/install-common-deps.sh | 5 ++++- .github/scripts/macOS/install_others.sh | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh index cd31d95fb..28c521765 100644 --- a/.github/scripts/environment.sh +++ b/.github/scripts/environment.sh @@ -28,7 +28,6 @@ export FEATURES="\ --enable-aja\ --enable-blank\ --enable-caca\ - --enable-cineform\ --enable-decklink\ --enable-file\ --enable-gl\ @@ -81,4 +80,9 @@ case "$RUNNER_OS" in return 1 ;; esac + +if [ "$(uname -s)" != Darwin ] || [ "$(uname -m)" != arm64 ]; then + FEATURES="$FEATURES --enable-cineform" +fi + printf '%b' "FEATURES=$FEATURES\n" >> "$GITHUB_ENV" diff --git a/.github/scripts/install-common-deps.sh b/.github/scripts/install-common-deps.sh index d32e79edb..147b16f14 100755 --- a/.github/scripts/install-common-deps.sh +++ b/.github/scripts/install-common-deps.sh @@ -15,7 +15,10 @@ if ! command -v nproc >/dev/null; then nproc() { sysctl -n hw.logicalcpu; } # mac fi -is_arm() { expr "$(dpkg --print-architecture)" : arm >/dev/null; } +is_arm() { + uname_m=$(uname -m) + expr "$uname_m" : arm > /dev/null || [ "$uname_m" = aarch64 ] +} is_win() { [ "$win" = yes ]; } if is_win || [ "$(id -u)" -eq 0 ]; then diff --git a/.github/scripts/macOS/install_others.sh b/.github/scripts/macOS/install_others.sh index bf7a0211c..1599048ed 100755 --- a/.github/scripts/macOS/install_others.sh +++ b/.github/scripts/macOS/install_others.sh @@ -38,7 +38,7 @@ install_aja() {( install_deltacast() {( DELTA_CACHE_INST=${SDK_NONFREE_PATH-nonexistent}/VideoMasterHD_inst - if [ ! -d "$DELTA_CACHE_INST" ]; then + if [ ! -d "$DELTA_CACHE_INST" ] || [ "$(uname -m)" = arm64 ]; then return 0 fi FEATURES="$FEATURES --enable-deltacast"