Better clang workaround

XRPLF · Dec 14, 2023 · 44ca5f9 · 44ca5f9
1 parent cda535f
commit 44ca5f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git 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
@@ -208,7 +208,10 @@ 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
@@ -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()