Skip to content

Commit 53affad

Browse files
authored
Merge pull request #1443 from matejak/travis_update
Cleaned the Travis setup up.
2 parents bf2be3b + 9c9088d commit 53affad

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

.travis.yml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ language: c
33
matrix:
44
include:
55
- os: linux
6+
dist: bionic
67
addons:
78
apt:
8-
sources:
9-
- ubuntu-toolchain-r-test
109
packages:
11-
- cmake
1210
- lcov
1311
- libdbus-1-dev
1412
- libdbus-glib-1-dev
@@ -28,14 +26,13 @@ matrix:
2826
- swig
2927
- librtmp-dev
3028
- xsltproc
31-
- gcc-7
3229
before_script:
33-
- export CC=gcc-7 GCOV=gcov-7
3430
- cd build
3531
script:
3632
- cmake -DCMAKE_BUILD_TYPE=Debug ../
37-
- build-wrapper-linux-x86-64 --out-dir bw-output make all || true # Will always fail builds on forked repositories.
38-
- cd .. && sonar-scanner || true # Will always fail builds on forked repositories.
33+
- build-wrapper-linux-x86-64 --out-dir bw-output make all || make all # build-wrapper won't work on forked repositories.
34+
- ctest --output-on-failure || true # Tests won't pass on Ubuntu.
35+
- (cd .. && sonar-scanner) || true # Will always fail builds on forked repositories.
3936
after_success:
4037
- curl -s https://codecov.io/bash > cov.sh && bash cov.sh -x "$GCOV"
4138
- os: osx
@@ -54,12 +51,6 @@ matrix:
5451
addons:
5552
sonarcloud:
5653
organization: "openscap"
57-
apt:
58-
sources:
59-
- ubuntu-toolchain-r-test
60-
packages:
61-
- gcc-7
62-
6354

6455
cache:
6556
directories:

0 commit comments

Comments
 (0)