This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/coverage_on_github_workflow
in repository https://gitbox.apache.org/repos/asf/celix.git


The following commit(s) were added to 
refs/heads/feature/coverage_on_github_workflow by this push:
     new 6d1b7f2  Updates github workflows
6d1b7f2 is described below

commit 6d1b7f2e64e55dc73983e05b1b479b6d08676420
Author: Pepijn Noltes <[email protected]>
AuthorDate: Fri Apr 17 13:47:09 2020 +0200

    Updates github workflows
---
 .github/workflows/coverage.yml |  8 ++------
 .github/workflows/ubuntu.yml   | 10 +++++++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 3ce90ee..eaf0e41 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -22,7 +22,8 @@ jobs:
             libffi-dev \
             libxml2-dev \
             libczmq-dev \
-            libcpputest-dev
+            libcpputest-dev \
+            lcov
           cd $GITHUB_WORKSPACE
       - name: Build
         env:
@@ -34,11 +35,6 @@ jobs:
           cd build
           cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} ..
           make -j
-      - name: Test
-        run: |
-          cd $GITHUB_WORKSPACE/build
-          export 
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:$(pwd)/utils:$(pwd)/framework:$(pwd)/dfi
-          make test ARGS="-V"
       - name: Coverage
         run: |
           cd $GITHUB_WORKSPACE/build
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 9b3f41b..426afc3 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -12,14 +12,18 @@ jobs:
         #compiler: [gcc, clang]
         include:
           - os: ubuntu-18.04
+            name: clang
+            sanitizer: false #note sanitizer on clang with cpputest does not 
work
             compiler: clang
             cxx_compiler: clang++
           - os: ubuntu-18.04
-            name: sanitizer
+            name: gcc
+            sanitizer: true
             compiler: gcc
             cxx_compiler: g++
           - os: ubuntu-18.04
             name: only v3 api
+            sanitizer: true
             compiler: gcc
             cxx_compiler: g++
             v3_api: true
@@ -49,6 +53,7 @@ jobs:
         CXX: ${{ matrix.cxx_compiler }}
         BUILD_OPTIONS: |
           -DENABLE_TESTING=ON
+        BUILD_OPTIONS_SANITIZER: |
           -DENABLE_ADDRESS_SANITIZER=ON
         BUILD_OPTIONS_V3_API: |
           -DCELIX_USE_ZIP_INSTEAD_OF_JAR=ON
@@ -59,6 +64,9 @@ jobs:
         if [[ "${{ matrix.v3_api }}" == "true" ]]; then
           export BUILD_OPTIONS="${BUILD_OPTIONS} ${BUILD_OPTIONS_V3_API}"
         fi
+        if [[ "${{ matrix.sanitizer }}" == "true" ]]; then
+          export BUILD_OPTIONS="${BUILD_OPTIONS} ${BUILD_OPTIONS_SANITIZER}"
+        fi
         cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} 
-DCMAKE_INSTALL_PREFIX=../install ..
         make -j && make install
     - name: Test

Reply via email to