@@ -33,28 +33,13 @@ addons:
3333 - libswresample-dev
3434
3535matrix :
36-
3736 include :
38- - name : " FFmpeg 2 GCC (Ubuntu 16.04 Xenial)"
39- env :
40- - BUILD_VERSION=ffmpeg2
41- - CMAKE_EXTRA_ARGS=""
42- - TEST_TARGET="os_test"
43- os : linux
44- dist : xenial
45- addons :
46- apt :
47- sources :
48- - sourceline : ' ppa:openshot.developers/libopenshot-daily'
49- - sourceline : ' ppa:beineri/opt-qt-5.10.0-xenial'
50- packages :
51- - *ff_common
5237
53- - name : " FFmpeg 3 GCC (Ubuntu 18.04 Bionic)"
38+ - name : " Coverage (Ubuntu 18.04 Bionic)"
5439 env :
55- - BUILD_VERSION=ffmpeg3
56- - CMAKE_EXTRA_ARGS=""
57- - TEST_TARGET=test
40+ - BUILD_VERSION=coverage_ffmpeg3
41+ - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1 "
42+ - TEST_TARGET=coverage
5843 os : linux
5944 dist : bionic
6045 addons :
@@ -65,7 +50,8 @@ matrix:
6550 packages :
6651 - *ff_common
6752 - qt5-default
68- - libjsoncpp-dev
53+ - lcov
54+ - binutils-common # For c++filt
6955
7056 - name : " FFmpeg 4 GCC (Ubuntu 18.04 Bionic)"
7157 env :
@@ -94,6 +80,23 @@ matrix:
9480 - libavresample4
9581 - libswresample3
9682
83+ - name : " FFmpeg 3 GCC (Ubuntu 18.04 Bionic)"
84+ env :
85+ - BUILD_VERSION=ffmpeg3
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+
97100 - name : " FFmpeg 3 Clang (Ubuntu 18.04 Bionic)"
98101 env :
99102 - BUILD_VERSION=clang_ffmpeg3
@@ -112,23 +115,20 @@ matrix:
112115 - qt5-default
113116 - libomp-dev
114117
115- - name : " Coverage (Ubuntu 18 .04 Bionic )"
118+ - name : " FFmpeg 2 GCC (Ubuntu 16 .04 Xenial )"
116119 env :
117- - BUILD_VERSION=coverage_ffmpeg3
118- - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1 "
119- - TEST_TARGET=coverage
120+ - BUILD_VERSION=ffmpeg2
121+ - CMAKE_EXTRA_ARGS=""
122+ - TEST_TARGET="os_test"
120123 os : linux
121- dist : bionic
124+ dist : xenial
122125 addons :
123126 apt :
124127 sources :
125128 - sourceline : ' ppa:openshot.developers/libopenshot-daily'
126- - sourceline : ' ppa:beineri/opt-qt-5.12.3-bionic '
129+ - sourceline : ' ppa:beineri/opt-qt-5.10.0-xenial '
127130 packages :
128131 - *ff_common
129- - qt5-default
130- - lcov
131- - binutils-common # For c++filt
132132
133133script :
134134 - mkdir -p build; cd build;
0 commit comments