Skip to content

Commit

Permalink
Fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
ldm0 committed Apr 5, 2024
1 parent 0bad50e commit 0cec039
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ jobs:
- rust: "nightly"
ffmpeg-version: "release/7.0"
should_test: "true"
- ffmpeg-version: "release/6.0"
additional-cargo-flags: "--no-default-features --features ffmpeg6"
- ffmpeg-version: "release/6.1"
additional-cargo-flags: "--no-default-features --features ffmpeg6"
exclude:
# Only run valgrind with latest FFmpeg and nightly rust to reduce resource consumption.
- valgrind: "valgrind"
Expand Down Expand Up @@ -173,12 +177,12 @@ jobs:
export FFMPEG_PKG_CONFIG_PATH=${PWD}/tmp/ffmpeg_build/lib/pkgconfig
if [ '${{ matrix.should_test }}' == 'true' ]; then
if [ '${{ matrix.valgrind }}' == 'valgrind' ]; then
cargo valgrind test -vv
cargo valgrind test ${{ matrix.additional-cargo-flags }}
else
cargo test -vv
cargo test ${{ matrix.additional-cargo-flags }}
fi
else
cargo test --no-run -vv
cargo test ${{ matrix.additional-cargo-flags }} --no-run
fi
# Cross build on Ubuntu, then send it to Windows machine for CI.
Expand Down Expand Up @@ -273,7 +277,7 @@ jobs:
LLVM_CONFIG_PATH: ${{ github.workspace }}/clang/bin/llvm-config
run: |
copy ${{ github.workspace }}/ffmpeg_prebuilt_cross/lib/libffmpeg.dll .
cargo test --tests --target i686-pc-windows-msvc -vv -- --skip transcode
cargo test --tests --target i686-pc-windows-msvc -- --skip transcode
# Check if correct documentation can be generated by docs.rs
docs_rs_check:
Expand All @@ -298,4 +302,4 @@ jobs:
- name: Set env
run: echo "DOCS_RS=1" >> $GITHUB_ENV
- name: Document Generation
run: cargo doc -vv
run: cargo doc

0 comments on commit 0cec039

Please sign in to comment.