Skip to content

Commit 45b68ce

Browse files
authored
Merge pull request #521 from ferdnyc/allow-ffmpeg32-fail
Travis: allow_failures for FFmpeg 3.2
2 parents 10ed4ba + 4567154 commit 45b68ce

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,12 @@ addons:
3232
- curl
3333

3434
jobs:
35-
include:
3635

36+
# The FFmpeg 3.2 backport PPA has gone missing
37+
allow_failures:
38+
- name: "FFmpeg 3.2 GCC (Ubuntu 16.04 Xenial)"
39+
40+
include:
3741
- name: "Coverage + FFmpeg 3.4 GCC (Ubuntu 18.04 Bionic)"
3842
env:
3943
- BUILD_VERSION=coverage_ffmpeg34
@@ -45,7 +49,6 @@ jobs:
4549
apt:
4650
sources:
4751
- sourceline: 'ppa:openshot.developers/libopenshot-daily'
48-
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
4952
packages:
5053
- *p_common
5154
- qt5-default
@@ -92,7 +95,6 @@ jobs:
9295
apt:
9396
sources:
9497
- sourceline: 'ppa:openshot.developers/libopenshot-daily'
95-
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
9698
packages:
9799
- *p_common
98100
- qt5-default
@@ -110,7 +112,6 @@ jobs:
110112
apt:
111113
sources:
112114
- sourceline: 'ppa:openshot.developers/libopenshot-daily'
113-
- sourceline: 'ppa:beineri/opt-qt-5.10.0-xenial'
114115
- sourceline: 'ppa:jon-hedgerows/ffmpeg-backports'
115116
packages:
116117
- *p_common

0 commit comments

Comments
 (0)