diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f0bfaa5c7f059e4d174c68f86cc0c0c5879d8d33..1c735ee2f66d54a4803309479526145f569782b4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -146,6 +146,7 @@ jobs: fail-fast: false matrix: config: + - {os: windows-latest, python: 3.7, ffmpeg: "5.0"} - {os: windows-latest, python: 3.7, ffmpeg: "4.4"} - {os: windows-latest, python: 3.7, ffmpeg: "4.3"} @@ -166,8 +167,10 @@ jobs: pillow \ python=${{ matrix.config.python }} \ setuptools - if [[ "${{ matrix.config.ffmpeg }}" == "4.4" ]]; then - curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/4.4.1-7/ffmpeg-win_amd64.tar.gz + if [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then + curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-win_amd64.tar.gz + elif [[ "${{ matrix.config.ffmpeg }}" == "4.4" ]]; then + curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/4.4.1-8/ffmpeg-win_amd64.tar.gz else conda install -q -n pyav ffmpeg=${{ matrix.config.ffmpeg }} fi @@ -177,9 +180,9 @@ jobs: run: | . $CONDA/etc/profile.d/conda.sh conda activate pyav - if [[ "${{ matrix.config.ffmpeg }}" == "4.4" ]]; then - tar -xf ffmpeg.tar.gz -C $CONDA_PREFIX/Library/ - fi + if [[ "${{ matrix.config.ffmpeg }}" != "4.3" ]]; then + tar -xf ffmpeg.tar.gz -C $CONDA_PREFIX/Library/ + fi python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX/Library - name: Test diff --git a/scripts/fetch-vendor.json b/scripts/fetch-vendor.json index 709aaabb62feb6f9a38e7a49550a6998c18e78c6..41969df2c41b4e12d25797949016bfbdf95ab318 100644 --- a/scripts/fetch-vendor.json +++ b/scripts/fetch-vendor.json @@ -1,3 +1,3 @@ { - "urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/4.4.1-7/ffmpeg-{platform}.tar.gz"] + "urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-{platform}.tar.gz"] }