From ff6a795479ab689000d50721622e14cb4c7ab79b Mon Sep 17 00:00:00 2001
From: Polochon-street <polochonstreet@gmx.fr>
Date: Tue, 4 Apr 2023 18:58:15 +0200
Subject: [PATCH] Update CI to use jrottenberg/ffmpeg6.0 image

---
 .github/workflows/build.yml | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 59cf0a1..0b94bdb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ jobs:
     container: jrottenberg/ffmpeg:${{ matrix.ffmpeg_version }}-ubuntu
     strategy:
       matrix:
-        ffmpeg_version: ["3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1"]
+        ffmpeg_version: ["3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1", "6.0"]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -38,41 +38,6 @@ jobs:
         run: |
           cargo fmt -- --check
 
-  # Remove when ffmpeg 6.0 is available here https://github.com/jrottenberg/ffmpeg/
-  build-test-lint-linux-latest:
-    name: Linux - Latest ffmpeg - build, test and lint
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          sudo apt update
-          sudo apt install -y software-properties-common
-          sudo add-apt-repository -y ppa:savoury1/ffmpeg6
-          sudo add-apt-repository -y ppa:savoury1/ffmpeg4
-          sudo apt update
-          sudo apt install -y --no-install-recommends clang curl pkg-config ffmpeg libavutil-dev libavcodec-dev libavformat-dev libavfilter-dev libavfilter-dev libavdevice-dev libswresample-dev
-      - name: Set up Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-          components: rustfmt, clippy
-      - name: Build
-        run: |
-          cargo build --examples
-      - name: Test
-        run: |
-          cargo test --examples
-      - name: Lint
-        run: |
-          cargo clippy --examples -- -D warnings
-      - name: Check format
-        run: |
-          cargo fmt -- --check
-
   build-test-lint-macos:
     name: macOS - FFmpeg latest - build, test and lint
     runs-on: macos-latest