Fix gcov/coveralls submission

.github/workflows/unit.yml

@@ -42,6 +42,14 @@ jobs:
       if: contains(matrix.cc, 'tcc')
       run: sudo apt-get install -y tcc
 
+    - name: Install lcov (Ubuntu+gcc)
+      if: contains(matrix.cc, 'gcc')
+      run: |
+        curl -LO https://github.com/linux-test-project/lcov/releases/download/v1.15/lcov-1.15.tar.gz
+        tar xzf lcov-1.15.tar.gz
+        cd lcov-1.15
+        sudo make install
+
     - name: Run ci-unix (Ubuntu, macOS)
       if: ${{ !contains(matrix.os, 'windows') }}
       run: test/unit/ci-unix.sh
@@ -52,3 +60,14 @@ jobs:
       if: contains(matrix.os, 'windows')
       shell: cmd
       run: test\\unit\\ci-windows.bat
+
+    - name: Submit coverage to Coveralls
+      id: coverage
+      if: contains(matrix.cc, 'gcc')
+      uses: coverallsapp/github-action@1.1.3
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Print Coveralls submission result
+      if: contains(matrix.cc, 'gcc')
+      run: echo ${{ steps.coverage.outputs['coveralls-api-result'] }}

test/unit/ci-unix.sh

@@ -27,15 +27,13 @@ if [[ "$CC" == "scan-build" ]]; then
     exit $?
 fi
 
-if [ "$CC" = "gcov" ]; then
+# Run the "more" variant of unit tests
+tools/unit.sh more
+
+if [ "$CC" = "gcc" ]; then
+    # Collect coverage info.
+    # This is submitted to Coveralls as a separate GitHub Action.
     unset CC
     unset CXX
-    tools/gcov.sh
-    pip install --user idna==2.5 # below packages conflict with idna-2.6 (not sure if this is still necessary on bionic)
-    pip install --user cpp-coveralls urllib3[secure]
-    coveralls --no-gcov --include src
-    exit $?
+    tools/coverage.sh
 fi
-
-# Run the "more" variant of unit tests
-tools/unit.sh more

tools/coverage.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+set -e
+
+# run unit tests with coverage
+tools/unit.sh run-coverage
+
+# run gcov for traditional text-based coverage output
+rm -rf coverage
+mkdir -p coverage
+gcov --object-directory test/.build/coverage/objs/src/mpack `find src -name '*.c'` || exit $?
+mv *.gcov coverage
+
+# run lcov
+lcov --capture --directory test/.build/coverage/objs/src --output-file coverage/lcov.info
+
+# generate HTML coverage
+genhtml coverage/lcov.info --output-directory coverage/html
+
+echo
+echo "Done. Results written in coverage/"
+echo "View HTML results in: file://$(pwd)/coverage/index.html"