diff --git a/.github/workflows/build-ffmpeg.yml b/.github/workflows/build-ffmpeg.yml index 1625ca89..117fbbf1 100644 --- a/.github/workflows/build-ffmpeg.yml +++ b/.github/workflows/build-ffmpeg.yml @@ -26,10 +26,10 @@ jobs: - os: macos-13 arch: x86_64 shell: bash - - os: ubuntu-latest + - os: ubuntu-24.04 arch: i686 shell: bash - - os: ubuntu-latest + - os: ubuntu-24.04 arch: x86_64 shell: bash - os: windows-latest @@ -64,7 +64,7 @@ jobs: env: CIBW_ARCHS: ${{ matrix.arch }} CIBW_BEFORE_BUILD: python scripts/build-ffmpeg.py /tmp/vendor --commercial --enable-cuda - CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor --commercial + CIBW_BEFORE_BUILD_WINDOWS: python scripts\build-ffmpeg.py C:\cibw\vendor --commercial --enable-cuda CIBW_BUILD: cp39-* CIBW_REPAIR_WHEEL_COMMAND_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH auditwheel repair -w {dest_dir} {wheel} CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair --add-path C:\cibw\vendor\bin -w {dest_dir} {wheel} diff --git a/scripts/build-ffmpeg.py b/scripts/build-ffmpeg.py index 1559ae6a..2155ab7c 100644 --- a/scripts/build-ffmpeg.py +++ b/scripts/build-ffmpeg.py @@ -257,7 +257,7 @@ def main(): dest_dir = args.destination community = args.community - enable_cuda = args.enable_cuda and plat == "Linux" + enable_cuda = args.enable_cuda and plat in {"Linux", "Windows"} del args output_dir = os.path.abspath("output")