Skip to content

Commit a2e9c51

Browse files
authored
Merge pull request #3 from adam-stamand/develop
CI Fixes
2 parents 9b16547 + 6074f82 commit a2e9c51

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

.travis.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,22 @@ env:
1717

1818
install:
1919
- sudo apt-get -qq update
20-
- sudo apt-get install -y libgtest-dev valgrind
21-
- pip install --user cpp-coveralls
22-
- pip install --user meson
20+
- sudo apt-get install -y libgtest-dev valgrind ninja-build
21+
- sudo apt-get install -y python3-dev python3-pip python3-setuptools
22+
- pip3 install -U pip
23+
- python3 -m pip install --user cpp-coveralls
24+
- python3 -m pip install --user meson
2325
- echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
2426

2527
before_script:
2628
# Check versions of gcc, g++ and cmake
2729
- ${COMPILER} -v
2830
# Run your build commands next
2931
- make config.linux CXX=${COMPILER}
30-
- make build.linux
32+
- make build.linux CXX=${COMPILER}
3133

3234
script:
33-
- make test.linux
35+
- make test.linux CXX=${COMPILER}
3436

3537
matrix:
3638
- os: linux

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ config.linux:
1111
--werror
1212

1313
build.linux:
14-
meson compile -C build/linux
14+
meson compile -C build/linux/${CXX}
1515

1616
test.linux:
17-
meson test -C build/linux --print-errorlogs
17+
meson test -C build/linux/${CXX} --print-errorlogs
1818

1919
clean:
2020
rm -rf build

0 commit comments

Comments
 (0)