Skip to content

Commit dae0273

Browse files
committed
Move ffmpeg install to yml file
1 parent 5628d19 commit dae0273

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/scripts/unittest-linux/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ unset PYTORCH_VERSION
1111

1212
set -e
1313

14-
conda install -y "ffmpeg<=7"
14+
# conda install -y "ffmpeg<=7"
1515

1616
export GPU_ARCH_TYPE="cpu"
1717

@@ -44,4 +44,4 @@ printf "* Installing test tools\n"
4444
# On this CI, for whatever reason, we're only able to install ffmpeg 4.
4545

4646

47-
pip3 install parameterized requests coverage pytest pytest-cov scipy numpy expecttest
47+
pip install parameterized requests coverage pytest pytest-cov scipy numpy expecttest

.github/workflows/unittest-linux-cpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
git config --global --add safe.directory /__w/audio/audio
5656
conda create --quiet -y --prefix ci_env python="${PYTHON_VERSION}"
5757
conda activate ./ci_env
58-
conda install -q -y pip numpy
58+
conda install -q -y pip numpy "ffmpeg<=7"
5959
6060
export PATH="${PWD}/third_party/install/bin/:${PATH}"
6161
export TORCHAUDIO_TEST_ALLOW_SKIP_IF_NO_CMD_APPLY_CMVN_SLIDING=true

.github/workflows/unittest-linux-gpu.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,18 @@ jobs:
5252
else
5353
export UPLOAD_CHANNEL=nightly
5454
fi
55+
56+
# Install miniforge
57+
wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
58+
bash Miniforge3.sh -b -p "${HOME}/conda"
59+
source "${HOME}/conda/etc/profile.d/conda.sh"
5560
5661
echo "::group::Create conda env"
5762
# Mark Build Directory Safe
5863
git config --global --add safe.directory /__w/audio/audio
5964
conda create --quiet -y --prefix ci_env python="${PYTHON_VERSION}"
6065
conda activate ./ci_env
66+
conda install -q -y pip numpy "ffmpeg<=7"
6167
6268
echo "::endgroup::"
6369
echo "::group::Install PyTorch"
@@ -72,7 +78,7 @@ jobs:
7278
7379
echo "::endgroup::"
7480
echo "::group::Build FFmpeg"
75-
.github/scripts/ffmpeg/build_gpu.sh
81+
7682
7783
echo "::endgroup::"
7884
echo "::group::Install other Dependencies"

0 commit comments

Comments
 (0)