Skip to content

Commit

Permalink
CI - Reduce windows test runner threads to 2
Browse files Browse the repository at this point in the history
  • Loading branch information
frankplow committed Apr 17, 2023
1 parent ed8dfe9 commit b2c991d
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@ jobs:
ffvvc-test:
name: ${{ matrix.os.name }}/${{ matrix.compiler.name }}/${{ matrix.assembler.name }}
env:
runner_threads: 4
configure_flags: --enable-ffmpeg --disable-everything --enable-decoder=vvc --enable-parser=vvc --enable-demuxer=vvc --enable-protocol=file,pipe --enable-encoder=rawvideo --enable-muxer=rawvideo,md5
strategy:
fail-fast: false
matrix:
os:
- { name: linux, runner: ubuntu-latest, shell: bash }
- { name: windows, runner: windows-latest, shell: 'msys2 {0}' }
- { name: linux, runner: ubuntu-latest, shell: bash, runner_threads: 4 }
- { name: windows, runner: windows-latest, shell: 'msys2 {0}', runner_threads: 2 }
compiler:
- { name: gcc, flags: --cc=gcc }
- { name: clang, flags: --cc=clang }
Expand All @@ -29,15 +28,15 @@ jobs:
- { name: yasm, flags: --as=yasm }
- { name: nasm, flags: --as=nasm }
exclude:
- os: { name: linux, runner: ubuntu-latest, shell: bash }
- os: { name: linux, runner: ubuntu-latest, shell: bash, runner_threads: 4}
compiler: { name: msvc, flags: --toolchain=msvc }
- os: { name: linux, runner: ubuntu-latest, shell: bash }
- os: { name: linux, runner: ubuntu-latest, shell: bash, runner_threads: 4 }
assembler: { name: yasm, flags: --as=yasm }
- os: { name: linux, runner: ubuntu-latest, shell: bash }
- os: { name: linux, runner: ubuntu-latest, shell: bash, runner_threads: 4 }
assembler: { name: nasm, flags: --as=nasm }
- os: { name: windows, runner: windows-latest, shell: 'msys2 {0}' }
- os: { name: windows, runner: windows-latest, shell: 'msys2 {0}', runner_threads: 2 }
compiler: { name: gcc, flags: --cc=gcc }
- os: { name: windows, runner: windows-latest, shell: 'msys2 {0}' }
- os: { name: windows, runner: windows-latest, shell: 'msys2 {0}', runner_threads: 2 }
compiler: { name: clang, flags: --cc=clang }

runs-on: ${{ matrix.os.runner }}
Expand Down Expand Up @@ -83,7 +82,7 @@ jobs:
path: tests

- name: Unit test
run: python3 tests/tools/ffmpeg.py --threads ${{ env.runner_threads }} --ffmpeg-path=./FFmpeg/ffmpeg tests/conformance/passed
run: python3 tests/tools/ffmpeg.py --threads ${{ matrix.os.runner_threads }} --ffmpeg-path=./FFmpeg/ffmpeg tests/conformance/passed

- name: Negative test
run: python3 tests/tools/ffmpeg.py --threads ${{ env.runner_threads }} --ffmpeg-path=./FFmpeg/ffmpeg tests/conformance/failed || true
run: python3 tests/tools/ffmpeg.py --threads ${{ matrix.os.runner_threads }} --ffmpeg-path=./FFmpeg/ffmpeg tests/conformance/failed || true

0 comments on commit b2c991d

Please sign in to comment.