Skip to content

Commit

Permalink
2018 12 mkind fixing travis (#66)
Browse files Browse the repository at this point in the history
* installing coveralls w/o install script

* removing unused installation routines

* updating travis dependencies
  • Loading branch information
mkind committed Dec 5, 2018
1 parent 5d5c1a8 commit 52e020c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 51 deletions.
25 changes: 0 additions & 25 deletions .ci/before_install.sh

This file was deleted.

17 changes: 0 additions & 17 deletions .ci/install.sh

This file was deleted.

17 changes: 8 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ matrix:
compiler: clang
env: EXTRA_FLAGS="-DCLANG_ADDRESS_SANITIZER=ON"
- os: linux
compiler: gcc-5
env: GCOV=gcov-5 CMAKE_FLAGS="-DUSE_COVERAGE=ON"
compiler: gcc-6
env: GCOV=gcov-6 CMAKE_FLAGS="-DUSE_COVERAGE=ON"

before_install:
# cmocka
Expand All @@ -17,29 +17,28 @@ before_install:
- cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .. && make -j2 && sudo make install
- cd ../..
- rm -rf cmocka-1.1.3
- .ci/before_install.sh

install: .ci/install.sh
# coveralls
- pip -q install --user --upgrade cpp-coveralls

addons:
apt:
sources:
- deadsnakes
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-5.0
packages:
- autoconf
- automake
- build-essential
- clang-3.4
- clang-5.0
- cmake
- g++-5-multilib
- g++-6-multilib
- g++-multilib
- gcc-5-multilib
- gcc-6-multilib
- gcc-multilib
- gdb
- libc6-dev-i386
- libtool
- llvm-3.4-dev
- ninja-build
- pkg-config
- python3.7-dev
Expand Down

0 comments on commit 52e020c

Please sign in to comment.