Skip to content

Commit

Permalink
Merge 1e8dbd9 into a52026a
Browse files Browse the repository at this point in the history
  • Loading branch information
yitsushi committed Jan 16, 2017
2 parents a52026a + 1e8dbd9 commit 2489697
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 20 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -10,3 +10,4 @@ cmake_install.cmake
Makefile
Testing
coverage
coverage.info.cleaned
4 changes: 3 additions & 1 deletion .travis.yml
Expand Up @@ -10,5 +10,7 @@ install:
- gem install coveralls-lcov

script:
- docker run --rm -e COVERALLS_TOKEN=${COVERALLS_TOKEN} -e TRAVIS_JOB_ID=${TRAVIS_JOB_ID} -v $(pwd):/code yitsushi/cpp-commander
- docker run --rm -v `pwd`:`pwd` -w `pwd` yitsushi/cpp-commander ./build-and-run.sh

after_success:
- coveralls-lcov --repo-token ${COVERALLS_TOKEN} coverage.info.cleaned
25 changes: 8 additions & 17 deletions Dockerfile
@@ -1,22 +1,13 @@
FROM ubuntu:latest
FROM alpine:latest

MAINTAINER Balazs Nadasdi <balazs.nadasdi@cheppers.com>

RUN apt-get update && \
apt-get install -y gcc g++ cmake \
lcov libboost-all-dev \
ruby gem && \
rm -rf /var/lib/apt/lists/*
RUN apk add --no-cache \
boost-dev git \
gcc g++ cmake make \
bash perl

RUN apt-get update && \
apt-get install -y git-core && \
rm -rf /var/lib/apt/lists/*

RUN gem install coveralls-lcov

VOLUME /code

WORKDIR /code

ENTRYPOINT ["./build-and-run.sh"]
RUN cd /tmp/ && \
git clone https://github.com/linux-test-project/lcov.git && \
cd lcov && make install

4 changes: 2 additions & 2 deletions build-and-run.sh
Expand Up @@ -2,11 +2,11 @@

set -e

find . \( -name CMakeFiles -o -name CMakeCache.txt \) -print | xargs rm -rf

cmake -DCMAKE_BUILD_TYPE=Debug -DWITHCOVERAGE=1 .

cmake --build .
ctest

make coverage

coveralls-lcov --repo-token ${COVERALLS_TOKEN} coverage.info.cleaned

0 comments on commit 2489697

Please sign in to comment.