Merge pull request #55 from Polochon-street/add-proper-ffmpeg6-ci

Add proper 6.0 CI support

Author: Polochon-street

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     container: jrottenberg/ffmpeg:${{ matrix.ffmpeg_version }}-ubuntu
     strategy:
       matrix:
-        ffmpeg_version: ['3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1']
+        ffmpeg_version: ['3.3', '3.4', '4.0', '4.1', '4.2', '4.3', '4.4', '5.0', '5.1', '6.0']
       fail-fast: false
     env:
       FEATURES: avcodec,avdevice,avfilter,avformat,postproc,swresample,swscale
@@ -39,40 +39,3 @@ jobs:
       - name: Check format
         run: |
           cargo fmt -- --check
-  # Added only because there is no ffmpeg6 docker image here yet
-  # https://github.com/jrottenberg/ffmpeg
-  build-test-lint-latest:
-    name: FFmpeg Latest - build, test and lint
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    env:
-      FEATURES: avcodec,avdevice,avfilter,avformat,postproc,swresample,swscale
-    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 --features $FEATURES
-      - name: Test
-        run: |
-          cargo test --features $FEATURES
-      - name: Lint
-        run: |
-          cargo clippy --features $FEATURES -- -D warnings
-      - name: Check format
-        run: |
-          cargo fmt -- --check