install ffmpeg via conda instead of action

billbrod · Feb 8, 2024 · a7a93fd · a7a93fd
1 parent 644425a
commit a7a93fd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -51,8 +51,6 @@ jobs:
           conda install -n base mamba
           conda clean --all -y
           mamba env create -f environment.yml
-      - name: Setup FFmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v2
       - name: Download data
         run: |
           mkdir -p data/metamers/ref_images/

diff --git a/environment.yml b/environment.yml
@@ -8,6 +8,7 @@ channels:
 dependencies:
   - python>=3.7
   - pip
+  - ffmpeg
   - ipykernel
   - scipy>=1.6
   - seaborn>=0.11