Merge e9559b3 into 4b0b8d7

GlPortal · Jul 8, 2018 · 19b9283 · 19b9283
2 parents 4b0b8d7 + e9559b3
commit 19b9283
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.travis.yml b/.travis.yml
@@ -6,10 +6,13 @@ matrix:
   include:
     - os: linux
       services: docker
-      before_install: 
+      before_install:
         - docker pull glportal/whale-gcc:coverall
+        - pip install --user cpp-coveralls
       script:
-        - docker run -it --rm -w /data -v $(pwd):/data glportal/whale-gcc:coverall bash -c "cmake -DCOVERAGE:BOOL=ON ./&& make && make tests&& ctest&& coveralls --dryrun -i include -i source -e tests --gcov-options \'-lp\' && cmake -DCOVERAGE:BOOL=ON ./&& make tests&& ctest&& coveralls -i include -i source -e tests --gcov-options \'-lp\' > /dev/null;"
+          # cmake currently has to be run twice, please see https://github.com/GlPortal/RadixEngine/issues/175
+        - docker run -it --rm -w /data -v $(pwd):/data glportal/whale-gcc:coverall bash -c "cmake -DCOVERAGE:BOOL=ON ./ && cmake -DCOVERAGE:BOOL=ON ./ && make tests && ctest;"
+        - coveralls -i include -i source -e tests --gcov-options \'-lp\' > /dev/null
     - os: osx
       osx_image: xcode8.3
       compiler: gcc