From 3c21d6c540e06805f668f89408b03cb4cd282859 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 28 Apr 2025 11:28:03 +0200 Subject: [PATCH 1/2] cpp_tests: Switch to only use conda-forge --- .github/workflows/cpp_tests.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cpp_tests.yaml b/.github/workflows/cpp_tests.yaml index 5e31babc..f391b866 100644 --- a/.github/workflows/cpp_tests.yaml +++ b/.github/workflows/cpp_tests.yaml @@ -19,17 +19,15 @@ jobs: strategy: fail-fast: false matrix: - # TODO put back 6.1.1. See - # https://github.com/pytorch/torchcodec/issues/518 - ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '7.0.1'] + ffmpeg-version-for-tests: ['4.4.2', '5.1.2', '6.1.1', '7.0.1'] steps: - name: Check out repo uses: actions/checkout@v3 - name: Setup conda env - uses: conda-incubator/setup-miniconda@v2 + uses: conda-incubator/setup-miniconda@v3 with: auto-update-conda: true - miniconda-version: "latest" + miniforge-version: latest activate-environment: test python-version: '3.12' - name: Update pip From d06c89c871e686406c647232625e9b817dc30dc7 Mon Sep 17 00:00:00 2001 From: Nicolas Hug Date: Mon, 28 Apr 2025 11:14:32 +0100 Subject: [PATCH 2/2] Check if C++ tests now work with ffmpeg6 --- .github/workflows/cpp_tests.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cpp_tests.yaml b/.github/workflows/cpp_tests.yaml index f391b866..b29aa4a9 100644 --- a/.github/workflows/cpp_tests.yaml +++ b/.github/workflows/cpp_tests.yaml @@ -24,10 +24,10 @@ jobs: - name: Check out repo uses: actions/checkout@v3 - name: Setup conda env - uses: conda-incubator/setup-miniconda@v3 + uses: conda-incubator/setup-miniconda@v2 with: auto-update-conda: true - miniforge-version: latest + miniconda-version: "latest" activate-environment: test python-version: '3.12' - name: Update pip