Skip to content

Commit e19291a

Browse files
authored
Travis: Drop extra FFmpeg 3.4 GCC job (#463)
1 parent 629517f commit e19291a

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

.travis.yml

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ addons:
3535
matrix:
3636
include:
3737

38-
- name: "Coverage (Ubuntu 18.04 Bionic)"
38+
- name: "Coverage + FFmpeg 3.4 GCC (Ubuntu 18.04 Bionic)"
3939
env:
4040
- BUILD_VERSION=coverage_ffmpeg34
4141
- CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1"
@@ -50,6 +50,7 @@ matrix:
5050
packages:
5151
- *ff_common
5252
- qt5-default
53+
- libjsoncpp-dev
5354
- lcov
5455
- binutils-common # For c++filt
5556

@@ -80,23 +81,6 @@ matrix:
8081
- libavresample4
8182
- libswresample3
8283

83-
- name: "FFmpeg 3.4 GCC (Ubuntu 18.04 Bionic)"
84-
env:
85-
- BUILD_VERSION=ffmpeg34
86-
- CMAKE_EXTRA_ARGS=""
87-
- TEST_TARGET=test
88-
os: linux
89-
dist: bionic
90-
addons:
91-
apt:
92-
sources:
93-
- sourceline: 'ppa:openshot.developers/libopenshot-daily'
94-
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
95-
packages:
96-
- *ff_common
97-
- qt5-default
98-
- libjsoncpp-dev
99-
10084
- name: "FFmpeg 3.4 Clang (Ubuntu 18.04 Bionic)"
10185
env:
10286
- BUILD_VERSION=clang_ffmpeg34

0 commit comments

Comments
 (0)