diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbf7a9bf4..6b4458f06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -171,23 +171,6 @@ jobs: echo "OAK_OFX_PLUGIN_PATH=$PLUGIN_DIR" >> "$GITHUB_ENV" echo "OAK_OFX_PLUGIN_ID=net.sf.openfx.ChromaKeyerPlugin" >> "$GITHUB_ENV" - - name: Build OpenFX-Misc plugins (Windows) - if: runner.os == 'Windows' - shell: msys2 {0} - run: | - cd openfx-misc - mingw32-make -j4 - mingw32-make install - PLUGIN_FILE=$(find /usr/OFX/Plugins /usr/local/OFX/Plugins . -name "*.ofx.bundle" -print -quit 2>/dev/null | head -1) - if [ -n "$PLUGIN_FILE" ]; then - PLUGIN_DIR=$(dirname "$PLUGIN_FILE") - else - PLUGIN_DIR="$PWD" - fi - echo "OAK_OFX_ITEST=1" >> "$GITHUB_ENV" - echo "OAK_OFX_PLUGIN_PATH=$PLUGIN_DIR" >> "$GITHUB_ENV" - echo "OAK_OFX_PLUGIN_ID=net.sf.openfx.ChromaKeyerPlugin" >> "$GITHUB_ENV" - # ------------------------------------------------------------------ # Run all tests (including previously environment-gated OFX tests) # ------------------------------------------------------------------ @@ -234,11 +217,6 @@ jobs: if: runner.os == 'macOS' run: ./build/tests/gtest/olive-gtest --gtest_filter="PluginIntegration.*:PluginMisc.*" - - name: OFX Integration Tests (Windows) - if: runner.os == 'Windows' - shell: msys2 {0} - run: ./build/tests/gtest/olive-gtest --gtest_filter="PluginIntegration.*:PluginMisc.*" - - name: Audio Smoke Tests (Linux) if: runner.os == 'Linux' env: diff --git a/CMakeLists.txt b/CMakeLists.txt index 521a3f3a2..a008507ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -210,6 +210,10 @@ list(APPEND OLIVE_LIBRARIES FFMPEG::swresample ) +# Static FFmpeg (e.g. our Linux CI build) needs zlib for libavcodec. +find_package(ZLIB REQUIRED) +list(APPEND OLIVE_LIBRARIES ZLIB::ZLIB) + # Link PortAudio find_package(PortAudio REQUIRED) set(CMAKE_REQUIRED_INCLUDES ${PORTAUDIO_INCLUDE_DIRS}) diff --git a/act b/act new file mode 100755 index 000000000..d23696743 Binary files /dev/null and b/act differ