From a8f358b2a5699dd489225dcc65960f21acf821da Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Mon, 19 Aug 2024 16:21:21 -0700 Subject: [PATCH] Bump ffmpeg version + add support for running tests under macOS --- test/automated/tools.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/automated/tools.sh b/test/automated/tools.sh index 97e3ced49..f6d8f78f1 100755 --- a/test/automated/tools.sh +++ b/test/automated/tools.sh @@ -5,7 +5,15 @@ set -e function install_ffmpeg() { # install a specific version of ffmpeg - FFMPEG_VER="4.4.1" + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + OS="linux" + elif [[ "$OSTYPE" == "darwin"* ]]; then + OS="macos" + else + exit 1 + fi + + FFMPEG_VER="5.1" FFMPEG_PATH="$(pwd)/ffmpeg-$FFMPEG_VER" PATH=$FFMPEG_PATH:$PATH @@ -28,7 +36,7 @@ function install_ffmpeg() { fi rm -f ffmpeg.zip - curl -sL --fail https://github.com/ffbinaries/ffbinaries-prebuilt/releases/download/v${FFMPEG_VER}/ffmpeg-${FFMPEG_VER}-linux-64.zip --output ffmpeg.zip >/dev/null + curl -sL --fail https://github.com/ffbinaries/ffbinaries-prebuilt/releases/download/v${FFMPEG_VER}/ffmpeg-${FFMPEG_VER}-${OS}-64.zip --output ffmpeg.zip >/dev/null unzip -o ffmpeg.zip >/dev/null && rm -f ffmpeg.zip chmod +x ffmpeg PATH=$FFMPEG_PATH:$PATH