Skip to content

Commit c271352

Browse files
authored
Merge pull request #361 from ferdnyc/travis-clang
Add Clang compilation to Travis build matrix
2 parents 1208a10 + c002e2b commit c271352

File tree

1 file changed

+19
-3
lines changed

1 file changed

+19
-3
lines changed

.travis.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
language: cpp
2+
compiler: gcc
23

34
# This section uses a rather esoteric (and tricky!) feature of YAML,
45
# &aliases and *anchors, to build package lists out of sublists without
@@ -32,7 +33,7 @@ addons:
3233

3334
matrix:
3435
include:
35-
- name: "FFmpeg 2 (Ubuntu 16.04 Xenial)"
36+
- name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)"
3637
env: BUILD_VERSION=ffmpeg2
3738
os: linux
3839
dist: xenial
@@ -44,7 +45,7 @@ matrix:
4445
packages:
4546
- *ff_common
4647

47-
- name: "FFmpeg 3 (Ubuntu 18.04 Bionic)"
48+
- name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)"
4849
env: BUILD_VERSION=ffmpeg3
4950
os: linux
5051
dist: bionic
@@ -57,7 +58,7 @@ matrix:
5758
- *ff_common
5859
- qt5-default
5960

60-
- name: "FFmpeg 4 (Ubuntu 18.04 Bionic)"
61+
- name: "FFmpeg 4 GCC (Ubuntu 18.04 Bionic)"
6162
env: BUILD_VERSION=ffmpeg4
6263
os: linux
6364
dist: bionic
@@ -80,6 +81,21 @@ matrix:
8081
- libavresample4
8182
- libswresample3
8283

84+
- name: "FFmpeg 3 Clang (Ubuntu 18.04 Bionic)"
85+
env: BUILD_VERSION=ffmpeg3
86+
os: linux
87+
dist: bionic
88+
compiler: clang
89+
addons:
90+
apt:
91+
sources:
92+
- sourceline: 'ppa:openshot.developers/libopenshot-daily'
93+
- sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
94+
packages:
95+
- *ff_common
96+
- qt5-default
97+
- libomp-dev
98+
8399
script:
84100
- mkdir -p build; cd build;
85101
- cmake -DCMAKE_BUILD_TYPE:STRING="Debug" ../

0 commit comments

Comments
 (0)