From e82e9330fb5f1f04f3f2ac742c92240d952721f2 Mon Sep 17 00:00:00 2001 From: Andrew Wason Date: Fri, 8 Dec 2023 14:21:42 -0500 Subject: [PATCH] fix macos GHA --- .github/workflows/ci.yml | 2 ++ builders/Darwin/mediafx-build.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29158da..531ac4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,8 @@ jobs: env: XCODE_VER: "15.0" steps: + - name: Upgrade bash + run: brew install bash - name: Checkout uses: actions/checkout@v4 with: diff --git a/builders/Darwin/mediafx-build.sh b/builders/Darwin/mediafx-build.sh index a3df56b..9bd4f6a 100755 --- a/builders/Darwin/mediafx-build.sh +++ b/builders/Darwin/mediafx-build.sh @@ -28,5 +28,5 @@ PATH=$INSTALL_ROOT/bin:$PATH cd "$MEDIAFX_BUILD" (cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE --install-prefix "$INSTALL_ROOT" "$MEDIAFX_ROOT" && cmake --build . && cmake --install .) || exit 1 if [[ -v MEDIAFX_TEST ]]; then - make test CTEST_OUTPUT_ON_FAILURE=1 ARGS="${MEDIAFX_TEST}"|| exit 1 + make test CTEST_OUTPUT_ON_FAILURE=1 ARGS="${MEDIAFX_TEST}" || exit 1 fi \ No newline at end of file