From 0e11fe4aec20ac85114258c3e21392b479e5119f Mon Sep 17 00:00:00 2001
From: Garrett D'Amore <garrett@damore.org>
Date: Fri, 27 Dec 2019 02:23:44 -0800
Subject: Attempt at improved coverage for Darwin and mbedTLS.

---
 .github/workflows/coverage.yml | 58 +++++++++++++++++++++++++++++++++---------
 .github/workflows/darwin.yml   |  7 +++--
 .github/workflows/linux.yml    | 10 ++++++--
 3 files changed, 59 insertions(+), 16 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 74db0715..dac9664f 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -2,24 +2,24 @@ name: coverage
 on: [push]
 jobs:
 
-  build:
-    name: build
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest ]
+  linux-coverage:
+    name: linux
+    runs-on: [ ubuntu-latest ]
     steps:
     - name: Check out code
       uses: actions/checkout@v1
 
+    - name: Install mbedTLS
+      run: sudo apt-get install libmbedtls-dev
+
+    - name: Install ninja
+      run: sudo apt-get install ninja-build
+
     - name: Configure
-      run: |
-        mkdir build
-        cd build
-        cmake -D NNG_ENABLE_COVERAGE=ON ..
+      run:  mkdir build && cd build && cmake -G Ninja -DNNG_ENABLE_COVERAGE=ON -DNNG_ENABLE_TLS=ON ..
 
     - name: build
-      run: cmake --build build
+      run: cd build && ninja
 
     - name: Test
       run: cd build && ctest --output-on-failure
@@ -28,4 +28,38 @@ jobs:
       uses: codecov/codecov-action@v1
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
-        yml: ./.codecov.yml
\ No newline at end of file
+        yml: ./.codecov.yml
+
+  darwin-coverage:
+    name: darwin
+    runs-on: [ macos-latest ]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v1
+
+      - name: Install mbedTLS
+        run: brew install mbedtls
+
+      - name: Install ninja
+        run: brew install ninja
+
+      - name: Install lcov
+        run: brew install lcov
+
+      - name: Configure
+        run:  mkdir build && cd build && cmake -G Ninja -DNNG_ENABLE_COVERAGE=ON -DNNG_ENABLE_TLS=ON ..
+
+      - name: build
+        run: cd build && ninja
+
+      - name: Test
+        run: cd build && ctest --output-on-failure
+
+      - name: Preprocess
+        run: cd build && lcov -c -d . -o lcov.info
+
+      - name: Upload report
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          yml: ./.codecov.yml
diff --git a/.github/workflows/darwin.yml b/.github/workflows/darwin.yml
index b4ea3d11..10d40007 100644
--- a/.github/workflows/darwin.yml
+++ b/.github/workflows/darwin.yml
@@ -9,11 +9,14 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v1
 
+    - name: Install ninja
+      run: brew install ninja
+
     - name: Configure
-      run: mkdir build && cd build && cmake ..
+      run: mkdir build && cd build && cmake -G Ninja ..
 
     - name: build
-      run: cmake --build build
+      run: cd build && ninja
 
     - name: Test
       run: cd build && ctest --output-on-failure
\ No newline at end of file
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 137fb682..35b60fcd 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -9,11 +9,17 @@ jobs:
     - name: Check out code
       uses: actions/checkout@v1
 
+    - name: Install mbedTLS
+      run: sudo apt-get install libmbedtls-dev
+
+    - name: Install ninja
+      run: sudo apt-get install ninja-build
+
     - name: Configure
-      run: mkdir build && cd build && cmake ..
+      run: mkdir build && cd build && cmake -G Ninja -D NNG_ENABLE_TLS=ON ..
 
     - name: Build
-      run: cmake --build build
+      run: cd build && ninja
 
     - name: Test
       run: cd build && ctest --output-on-failure
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2