From 6fa3fe5c1821ef364099c4c1ba8697fdc6b42385 Mon Sep 17 00:00:00 2001
From: Angus Gratton <gus@projectgus.com>
Date: Fri, 6 Dec 2024 16:11:49 +1100
Subject: [PATCH] ci: Run on two FFMPEG versions

- ffmpeg 4.4 on Ubuntu 22.04 (Jammy)
- ffmpeg 6.1 on Ubuntu 24.04 (Noble)
---
 .github/workflows/tests.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a5cede0b..ff9bfb18 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,11 +11,17 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-24.04  # "noble", ffmpeg 6.1
+            ffmpeg_feature: "ffmpeg_6_0"
+          - os: ubuntu-22.04  # "jammy", ffmpeg 4.4
+            ffmpeg_feature: "ffmpeg_4_4"
+    runs-on: ${{ matrix.os }}
     steps:
-    - name: Install ffmpeg
-      run: sudo apt-get -y install ffmpeg pkg-config libavutil-dev libavformat-dev libavfilter-dev libavdevice-dev
-    - uses: actions/checkout@v4
-    - name: Run tests
-      run: cargo test --all --verbose --features=ffmpeg_4_4
+      - name: Install ffmpeg
+        run: sudo apt-get -y install ffmpeg pkg-config libavutil-dev libavformat-dev libavfilter-dev libavdevice-dev
+      - uses: actions/checkout@v4
+      - name: Run tests
+        run: cargo test --all --verbose --features=${{ matrix.ffmpeg_feature }}