Merge pull request #763 from MFraters/fix_pip_env

fix/update tests
GeodynamicWorldBuilder · Oct 14, 2024 · ccb679d · ccb679d
2 parents 383a8fc + dd3b08a
commit ccb679d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -181,7 +181,7 @@ jobs:
             cat ${{github.workspace}}/result_${{matrix.benchmark_number}}.csv | cargo run --release analyze --disable-dynamic-printing > ${{github.workspace}}/benchmark_${{matrix.benchmark_number}}_results/analyze_${{matrix.benchmark_number}}.log ||:;
             cat ${{github.workspace}}/benchmark_${{matrix.benchmark_number}}_results/analyze_${{matrix.benchmark_number}}.log
     
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: benchmark_${{matrix.benchmark_number}}_results
         path: benchmark_${{matrix.benchmark_number}}_results/
diff --git a/.github/workflows/draft-pdf.yml b/.github/workflows/draft-pdf.yml
@@ -14,7 +14,7 @@ jobs:
           # This should be the path to the paper within your repo.
           paper-path: doc/JOSS/1.0/paper.md
       - name: Upload
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: paper
           # This is the output path where Pandoc will write the compiled

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -286,7 +286,7 @@ jobs:
         run: echo $PATH && export PATH=$PATH:/home/runner/.local/bin && echo $PATH && export PYTHONPATH=$PYTHONPATH:/home/runner/.local/bin
 
       - name: Install coveralls
-        run: pip install --user cpp-coveralls 
+        run: pipx install cpp-coveralls 
         shell: bash
 
       - name: Create Build Environment

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -351,8 +351,8 @@ SET(FORCE_COLORED_OUTPUT ON CACHE BOOL "Forces colored output when compiling wit
 
 IF ( CMAKE_BUILD_TYPE STREQUAL Coverage )
   SET(CMAKE_VERBOSE_MAKEFILE on )
-  SET(WB_COMPILER_OPTIONS_PRIVATE_COVERAGE_NEW --coverage -fprofile-arcs -ftest-coverage -g)
-  SET(WB_COMPILER_OPTIONS_PRIVATE_COVERAGE_OLD "--coverage -fprofile-arcs -ftest-coverage -g")
+  SET(WB_COMPILER_OPTIONS_PRIVATE_COVERAGE_NEW --coverage -fprofile-arcs -ftest-coverage -g -fprofile-update=atomic)
+  SET(WB_COMPILER_OPTIONS_PRIVATE_COVERAGE_OLD "--coverage -fprofile-arcs -ftest-coverage -g -fprofile-update=atomic")
 
   ## for old versions of cmake
   SET(WB_FORTRAN_COMPILER_FLAGS_COVERAGE "--coverage")

diff --git a/tests/unit_tests/unit_test_world_builder.cc b/tests/unit_tests/unit_test_world_builder.cc
@@ -3473,10 +3473,10 @@ TEST_CASE("WorldBuilder Types: Segment Object")
 {
 #define TYPE Segment
   const WorldBuilder::Point<2> thickness(1,2,invalid);
-  const WorldBuilder::Point<2> top_trucation(3,4,invalid);
+  const WorldBuilder::Point<2> top_truncation(3,4,invalid);
   const WorldBuilder::Point<2> angle(5,6,invalid);
   Objects::TYPE<Features::FaultModels::Temperature::Interface, Features::FaultModels::Composition::Interface, Features::FaultModels::Grains::Interface>
-  type (1.0, thickness, top_trucation, angle,
+  type (1.0, thickness, top_truncation, angle,
         std::vector<std::shared_ptr<Features::FaultModels::Temperature::Interface> >(),
         std::vector<std::shared_ptr<Features::FaultModels::Composition::Interface> >(),
         std::vector<std::shared_ptr<Features::FaultModels::Grains::Interface> >());