Skip to content

Commit 9eba87a

Browse files
cpp_tests: Switch to only use conda-forge and add back ffmpeg 6 (#658)
Co-authored-by: Nicolas Hug <contact@nicolas-hug.com>
1 parent ed13ac5 commit 9eba87a

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/cpp_tests.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,19 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
# TODO put back 6.1.1. See
23-
# https://github.com/pytorch/torchcodec/issues/518
24-
ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '7.0.1']
22+
ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1']
2523
steps:
2624
- name: Check out repo
2725
uses: actions/checkout@v3
2826
- name: Setup conda env
29-
uses: conda-incubator/setup-miniconda@v2
27+
uses: conda-incubator/setup-miniconda@v3
3028
with:
3129
auto-update-conda: true
32-
miniconda-version: "latest"
30+
# Using miniforge instead of miniconda ensures that the default
31+
# conda channel is conda-forge instead of main/default. This ensures
32+
# ABI consistency between dependencies:
33+
# https://conda-forge.org/docs/user/transitioning_from_defaults/
34+
miniforge-version: latest
3335
activate-environment: test
3436
python-version: '3.12'
3537
- name: Update pip

0 commit comments

Comments
 (0)