Skip to content

Commit

Permalink
Travis: Drop extra FFmpeg 3.4 GCC job (#463)
Browse files Browse the repository at this point in the history
  • Loading branch information
ferdnyc authored Mar 12, 2020
1 parent 629517f commit e19291a
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ addons:
matrix:
include:

- name: "Coverage (Ubuntu 18.04 Bionic)"
- name: "Coverage + FFmpeg 3.4 GCC (Ubuntu 18.04 Bionic)"
env:
- BUILD_VERSION=coverage_ffmpeg34
- CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1"
Expand All @@ -50,6 +50,7 @@ matrix:
packages:
- *ff_common
- qt5-default
- libjsoncpp-dev
- lcov
- binutils-common # For c++filt

Expand Down Expand Up @@ -80,23 +81,6 @@ matrix:
- libavresample4
- libswresample3

- name: "FFmpeg 3.4 GCC (Ubuntu 18.04 Bionic)"
env:
- BUILD_VERSION=ffmpeg34
- CMAKE_EXTRA_ARGS=""
- TEST_TARGET=test
os: linux
dist: bionic
addons:
apt:
sources:
- sourceline: 'ppa:openshot.developers/libopenshot-daily'
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
packages:
- *ff_common
- qt5-default
- libjsoncpp-dev

- name: "FFmpeg 3.4 Clang (Ubuntu 18.04 Bionic)"
env:
- BUILD_VERSION=clang_ffmpeg34
Expand Down

0 comments on commit e19291a

Please sign in to comment.