Skip to content

Commit 71939ae

Browse files
committed
Disable compiler checking in linux install script
Fix GCC 8 and Clang 7 Travis compilations
1 parent 0be26ee commit 71939ae

File tree

2 files changed

+44
-49
lines changed

2 files changed

+44
-49
lines changed

.travis.yml

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,78 @@
11
# Based on https://habrahabr.ru/post/329264/
22
# Additional GCC / clang versions:
33
# - https://docs.travis-ci.com/user/languages/cpp/
4+
# - https://gist.github.com/nabijaczleweli/e53219d037c4ccb34f3c
45

56
dist: xenial
67
sudo: required
78

89
language: cpp
910

11+
cache:
12+
apt: true
13+
14+
addons:
15+
apt:
16+
sources: &apt_sources
17+
- ubuntu-toolchain-r-test
18+
- llvm-toolchain-xenial-7
19+
packages:
20+
- g++-5
21+
1022
# Is there any way to avoid duplication for combination of BUILD_CONFIGURATION and COMPILER?
1123
# in case, when non-default compiler is used?
1224
matrix:
1325
include:
1426
# GCC 8 / Debug
1527
- os: linux
16-
compiler: gcc
17-
addons:
28+
addons: &gcc8
1829
apt:
19-
sources:
20-
- ubuntu-toolchain-r-test
30+
sources: *apt_sources
2131
packages:
22-
- gcc-8
2332
- g++-8
33+
compiler: gcc
2434
env:
25-
- HELLO_WORLD="GCC 8 / Debug"
2635
- MATRIX_EVAL="BUILD_TYPE=Debug && CC=gcc-8 && CXX=g++-8"
2736

2837
# GCC 8 / Release
2938
- os: linux
39+
addons: *gcc8
3040
compiler: gcc
31-
addons:
32-
apt:
33-
sources:
34-
- ubuntu-toolchain-r-test
35-
packages:
36-
- gcc-8
37-
- g++-8
3841
env:
39-
- HELLO_WORLD="GCC 8 / Release"
4042
- MATRIX_EVAL="BUILD_TYPE=Release && CC=gcc-8 && CXX=g++-8"
4143

4244
# GCC 5 / Debug
4345
- os: linux
4446
compiler: gcc
4547
env:
46-
- HELLO_WORLD="GCC 5 / Debug"
4748
- MATRIX_EVAL="BUILD_TYPE=Debug && CC=gcc-5 && CXX=g++-5"
4849

4950
# GCC 5 / Release
5051
- os: linux
5152
compiler: gcc
5253
env:
53-
- HELLO_WORLD="GCC 5 / Release"
5454
- MATRIX_EVAL="BUILD_TYPE=Release && CC=gcc-5 && CXX=g++-5"
5555

5656
# CLANG 7 / Release
5757
- os: linux
58-
compiler: clang
5958
addons:
6059
apt:
61-
sources:
62-
- ubuntu-toolchain-r-test
63-
- llvm-toolchain-xenial-7
60+
sources: *apt_sources
6461
packages:
65-
- clang-7
6662
- clang++-7
63+
compiler: clang
6764
env:
6865
- MATRIX_EVAL="BUILD_TYPE=Release CC=clang-7 && CXX=clang++-7"
6966

7067
- os: osx
7168
compiler: clang
7269
env:
7370
- MATRIX_EVAL="BUILD_TYPE=Debug"
74-
- MATRIX2="TEST1"
7571

7672
- os: osx
7773
compiler: clang
7874
env:
7975
- MATRIX_EVAL="BUILD_TYPE=Release"
80-
- MATRIX2="TEST2"
8176

8277
# exclude:
8378
# exclude some elements from build matrix:
@@ -96,9 +91,9 @@ matrix:
9691
install:
9792
# setup env:
9893
- source ci/travis/install-$TRAVIS_OS_NAME.sh
99-
- eval "${MATRIX_EVAL}"
10094

10195
script:
96+
- eval "${MATRIX_EVAL}"
10297
# build and test project:
10398
- mkdir build
10499
- cd build

ci/travis/install-linux.sh

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,31 @@ build_cmake()
3030
build_cmake
3131

3232
# Newer GCC
33-
if [ -n "$MATRIX_EVAL" ]; then
34-
echo "Prepare GCC"
35-
sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
36-
sudo apt-get -qq update
37-
(
38-
eval "${MATRIX_EVAL}"
39-
case "${CXX}" in
40-
g++-5)
41-
pkg='g\+\+-5'
42-
;;
43-
g++-6)
44-
pkg='g\+\+-6'
45-
;;
46-
g++-7)
47-
pkg='g\+\+-7'
48-
;;
49-
*)
50-
echo "Unknown compiler: ${CXX}"
51-
exit 1
52-
;;
53-
esac
54-
#sudo apt-get install -y 'g\+\+-5' 'g\+\+-6' 'g\+\+-7'
55-
sudo apt-get install -y "${pkg}"
56-
)
57-
fi
33+
#if [ -n "$MATRIX_EVAL" ]; then
34+
# echo "Prepare GCC"
35+
# sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
36+
# sudo apt-get -qq update
37+
# (
38+
# eval "${MATRIX_EVAL}"
39+
# case "${CXX}" in
40+
# g++-5)
41+
# pkg='g\+\+-5'
42+
# ;;
43+
# g++-6)
44+
# pkg='g\+\+-6'
45+
# ;;
46+
# g++-7)
47+
# pkg='g\+\+-7'
48+
# ;;
49+
# *)
50+
# echo "Unknown compiler: ${CXX}"
51+
# exit 1
52+
# ;;
53+
# esac
54+
# #sudo apt-get install -y 'g\+\+-5' 'g\+\+-6' 'g\+\+-7'
55+
# sudo apt-get install -y "${pkg}"
56+
# )
57+
#fi
5858

5959
# FFmpeg
6060
# - https://launchpad.net/~jonathonf/+archive/ubuntu/ffmpeg-3

0 commit comments

Comments
 (0)