Skip to content

Commit 6b84927

Browse files
Merge pull request #141 from Polochon-street/use-ffmpeg6-official-image
Update CI to use jrottenberg/ffmpeg6.0 image
2 parents 0bfca26 + ff6a795 commit 6b84927

File tree

1 file changed

+1
-36
lines changed

1 file changed

+1
-36
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
container: jrottenberg/ffmpeg:${{ matrix.ffmpeg_version }}-ubuntu
1212
strategy:
1313
matrix:
14-
ffmpeg_version: ["3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1"]
14+
ffmpeg_version: ["3.4", "4.0", "4.1", "4.2", "4.3", "4.4", "5.0", "5.1", "6.0"]
1515
fail-fast: false
1616
steps:
1717
- uses: actions/checkout@v2
@@ -38,41 +38,6 @@ jobs:
3838
run: |
3939
cargo fmt -- --check
4040
41-
# Remove when ffmpeg 6.0 is available here https://github.com/jrottenberg/ffmpeg/
42-
build-test-lint-linux-latest:
43-
name: Linux - Latest ffmpeg - build, test and lint
44-
runs-on: ubuntu-latest
45-
strategy:
46-
fail-fast: false
47-
steps:
48-
- uses: actions/checkout@v2
49-
- name: Install dependencies
50-
run: |
51-
sudo apt update
52-
sudo apt install -y software-properties-common
53-
sudo add-apt-repository -y ppa:savoury1/ffmpeg6
54-
sudo add-apt-repository -y ppa:savoury1/ffmpeg4
55-
sudo apt update
56-
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
57-
- name: Set up Rust
58-
uses: actions-rs/toolchain@v1
59-
with:
60-
toolchain: stable
61-
override: true
62-
components: rustfmt, clippy
63-
- name: Build
64-
run: |
65-
cargo build --examples
66-
- name: Test
67-
run: |
68-
cargo test --examples
69-
- name: Lint
70-
run: |
71-
cargo clippy --examples -- -D warnings
72-
- name: Check format
73-
run: |
74-
cargo fmt -- --check
75-
7641
build-test-lint-macos:
7742
name: macOS - FFmpeg latest - build, test and lint
7843
runs-on: macos-latest

0 commit comments

Comments
 (0)