Merge b39041f into 5898636

.github/scripts/run-cmake-coverage

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -euo pipefail
+
+WORKSPACE=$(cd "$(dirname "${BASH_SOURCE[0]}")"/../.. && /bin/pwd -P)
+PATH=$HOME/.local/bin:$PATH
+
+pip install --user cpp-coveralls
+
+# Build with coverage
+
+mkdir "${WORKSPACE}/_build_coverage" && cd $_
+CFLAGS="--coverage" CXXFLAGS="--coverage" LDFLAGS="--coverage" cmake ..
+make -j$(nproc)
+ctest -V -LE Benchmark
+
+# Collect coverage data
+
+export TRAVIS_BRANCH=${GITHUB_REF}
+coveralls --root .. --build-root . --gcov-options '\-lp' -E ".*/3rdparty/.*" -E ".*/_.*" -E ".*/tests/.*" -E ".*/benchmarks/.*" -E "./CMake.*CompilerId.c"

.github/scripts/run-cmake-test

@@ -26,19 +26,11 @@ cmake "${WORKSPACE}/3rdparty/googletest" -DCMAKE_INSTALL_PREFIX="${THIRDPARTY_PR
 make -j$(nproc)
 make install
 
-# Build with external dependencies and test coverage
+# Build with external dependencies
 
 mkdir "${WORKSPACE}/_build_coverage" && cd $_
-CFLAGS="--coverage" CXXFLAGS="--coverage" LDFLAGS="--coverage" cmake .. -DCMAKE_INSTALL_PREFIX="${THIRDPARTY_PREFIX_DIR}" -DUSE_THIRDPARTY_LIBRARIES=OFF
+cmake .. -DCMAKE_INSTALL_PREFIX="${THIRDPARTY_PREFIX_DIR}" -DUSE_THIRDPARTY_LIBRARIES=OFF
 make -j$(nproc)
 ctest -V -LE Benchmark
 mkdir -p deploy
 make DESTDIR="${PWD}/deploy" install
-
-# Collect coverage data
-
-#if [[ "${OS_ARG}" == "ubuntu"* ]]
-#then
-#    pip install --user cpp-coveralls
-#    coveralls --root .. --build-root . -E ".*/3rdparty/.*" -E ".*/_.*" -E ".*/tests/.*" -E ".*/benchmarks/.*"
-#fi

.github/scripts/run-prepare

@@ -16,7 +16,7 @@ case "${OS_ARG}" in
                 packages+=(bazel)
                 ;;
             cmake)
-                packages+=(libcurl4-openssl-dev)
+                packages+=(libcurl4-openssl-dev python-pip python-wheel)
                 ;;
         esac
 

.github/workflows/continuous-integration-workflow.yml

@@ -1,5 +1,5 @@
 name: Continuous Integration
-on: [push, pull_request]
+on: [] #[push, pull_request]
 
 jobs:
   build:

.github/workflows/coverage.yml

@@ -0,0 +1,21 @@
+name: Coverage
+on: [push, pull_request]
+
+jobs:
+  build:
+    name: Coverage ${{ matrix.buildsystem }} on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        buildsystem: [cmake]
+        os: [ubuntu-18.04]
+    steps:
+      - uses: actions/checkout@master
+        with:
+          submodules: true
+      - name: Prepare
+        run: .github/scripts/run-prepare ${{ matrix.buildsystem }} ${{ matrix.os }}
+      - name: Test
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+        run: .github/scripts/run-cmake-coverage

.travis.yml

@@ -11,27 +11,9 @@ env:
 addons:
   apt:
     packages:
-    - cmake
-    - curl
     - doxygen
-    - g++
-    - gcc
-    - git
-    - lcov
-    - libcurl4-openssl-dev
-    - python-pip
 
 script:
-  - pushd .
-  - mkdir _build_coverage
-  - cd _build_coverage
-  - CFLAGS="--coverage" CXXFLAGS="--coverage" LDFLAGS="--coverage" cmake .. -DUSE_THIRDPARTY_LIBRARIES=ON
-  - make -j 4
-  - ctest -V -LE Benchmark
-  - pip install --user cpp-coveralls
-  - coveralls --root .. --build-root . -E ".*/3rdparty/.*" -E ".*/_.*" -E ".*/tests/.*" -E ".*/benchmarks/.*"
-  - popd
-
   - pushd .
   - cd doc
   - doxygen