From 9be83592470b973828ff5d69fd2906f45e260e12 Mon Sep 17 00:00:00 2001
From: Bronek Kozicki <brok@incorrekt.com>
Date: Thu, 14 Dec 2023 17:31:56 +0000
Subject: [PATCH] Better clang workaround

---
 .github/actions/build/action.yml | 4 ----
 .github/workflows/nix.yml        | 6 +++++-
 Builds/CMake/RippledCov.cmake    | 4 ----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 6f5709088c6..79bbe9af075 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -12,10 +12,6 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: update path for clang-14
-      shell: bash
-      run: |
-        echo "/usr/lib/llvm-14/bin/" >> $GITHUB_PATH
     - name: configure
       shell: bash
       run: |
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index bbd1ea3ced6..c8a56763614 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -208,7 +208,11 @@ jobs:
         with:
           generator: Ninja
           configuration: ${{ matrix.configuration }}
-          cmake-args: '-DCODE_COVERAGE_REPORT_FORMAT=xml'
+          cmake-args: "
+            -DCODE_COVERAGE_REPORT_FORMAT=xml
+            -DCODE_COVERAGE_GCOV_TOOL=/usr/bin/gcov
+            -DCMAKE_CXX_FLAGS=\"-O0\"
+            -DCMAKE_C_FLAGS=\"-O0\""
           cmake-target: coverage_report
       - name: archive coverage results
         uses: actions/upload-artifact@v3
diff --git a/Builds/CMake/RippledCov.cmake b/Builds/CMake/RippledCov.cmake
index 55598dad60b..0723f14109f 100644
--- a/Builds/CMake/RippledCov.cmake
+++ b/Builds/CMake/RippledCov.cmake
@@ -7,16 +7,12 @@ ProcessorCount(PROCESSOR_COUNT)
 if (coverage)
   if (DEFINED CODE_COVERAGE_TEST_PARALLELISM)
     set(TEST_PARALLELISM ${CODE_COVERAGE_TEST_PARALLELISM})
-  elseif (DEFINED ENV{CODE_COVERAGE_TEST_PARALLELISM})
-    set(TEST_PARALLELISM $ENV{CODE_COVERAGE_TEST_PARALLELISM})
   else()
     set(TEST_PARALLELISM ${PROCESSOR_COUNT})
   endif()
 
   if (DEFINED CODE_COVERAGE_REPORT_FORMAT)
     set(CODE_COVERAGE_FORMAT ${CODE_COVERAGE_REPORT_FORMAT})
-  elseif (DEFINED ENV{CODE_COVERAGE_REPORT_FORMAT})
-    set(CODE_COVERAGE_FORMAT $ENV{CODE_COVERAGE_REPORT_FORMAT})
   else()
     set(CODE_COVERAGE_FORMAT html-details)
   endif()