From 9ec762bbd63c4462e8447b556e2bb42c76569dca Mon Sep 17 00:00:00 2001
From: moto <855818+mthrok@users.noreply.github.com>
Date: Wed, 12 Jul 2023 11:14:52 -0400
Subject: [PATCH] Allow more recent FFmpeg in unittests

---
 .github/scripts/unittest-linux/install.sh | 4 ++--
 .github/workflows/unittest-linux-gpu.yml  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/unittest-linux/install.sh b/.github/scripts/unittest-linux/install.sh
index 3c808e2fb4..885296219c 100755
--- a/.github/scripts/unittest-linux/install.sh
+++ b/.github/scripts/unittest-linux/install.sh
@@ -59,7 +59,7 @@ printf "Installing PyTorch with %s\n" "${cudatoolkit}"
 )
 
 # 2. Install torchaudio
-conda install --quiet -y 'ffmpeg>=4.1' ninja cmake
+conda install --quiet -y ninja cmake
 
 printf "* Installing torchaudio\n"
 python setup.py install
@@ -75,7 +75,7 @@ fi
 # Note: installing librosa via pip fail because it will try to compile numba.
 (
     set -x
-    conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} 'librosa==0.10.0' parameterized 'requests>=2.20'
+    conda install -y -c conda-forge ${NUMBA_DEV_CHANNEL} 'librosa==0.10.0' parameterized 'requests>=2.20' 'ffmpeg>=5,<7'
     pip install kaldi-io SoundFile coverage pytest pytest-cov 'scipy==1.7.3' expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag pyroomacoustics flashlight-text git+https://github.com/kpu/kenlm
 )
 # Install fairseq
diff --git a/.github/workflows/unittest-linux-gpu.yml b/.github/workflows/unittest-linux-gpu.yml
index 6efed2ba56..7e8b27cf4d 100644
--- a/.github/workflows/unittest-linux-gpu.yml
+++ b/.github/workflows/unittest-linux-gpu.yml
@@ -55,12 +55,11 @@ jobs:
           "${CUDATOOLKIT}"
 
         # Install torchaudio
-        conda install --quiet -y 'ffmpeg>=4.1' pkg-config
-        python3 -m pip --quiet install cmake>=3.18.0 ninja
+        conda install --quiet -y pkg-config 'cmake>=3.18.0' ninja
         python3 -m pip install -v -e . --no-use-pep517
 
         # Install test tools
-        conda install -y --quiet -c conda-forge -c numba/label/dev 'librosa==0.10.0' parameterized 'requests>=2.20'
+        conda install -y --quiet -c conda-forge -c numba/label/dev 'librosa==0.10.0' parameterized 'requests>=2.20' 'ffmpeg>=5,<7'
         python3 -m pip install --quiet kaldi-io SoundFile coverage pytest pytest-cov 'scipy==1.7.3' transformers expecttest unidecode inflect Pillow sentencepiece pytorch-lightning 'protobuf<4.21.0' demucs tinytag flashlight-text git+https://github.com/kpu/kenlm/
         python3 -m pip install --quiet git+https://github.com/pytorch/fairseq.git@e47a4c8