Update cppcheck for simplebuild v1.0.0 and split CI steps

mctools · Mar 6, 2024 · d41a697 · d41a697
1 parent 94cc3c4
commit d41a697
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/.github/workflows/condatest_cppcheck.yml b/.github/workflows/condatest_cppcheck.yml
@@ -39,15 +39,26 @@ jobs:
           python3 -m pip install --no-deps ./src_co
           echo "sb --version: "$(sb --version)
 
-      - name: Build and check
+      - name: Build and export commands
         run: |
-          set -eux
+          set -eu
           test -f $CONDA_PREFIX/share/Geant4/data/NDL*/Elastic/CrossSection/13_27_Aluminum.z
           geant4-config  --version
           mkdir test_rel && cd test_rel
           sb --init dgcode_val
-          SIMPLEBUILD_EXPORT_JSONCMDS=1 sb --requirepkg=DGCodeRecommended
-          export THECMDFILE="$PWD"/simplebuild_cache/bld/compile_commands.json
-          test -f "$THECMDFILE"
+          sb --exportcmds cmds.json  --requirepkg=DGCodeRecommended
+          test -f cmds.json
+
+      - name: Run cppcheck
+        run: |
+          set -eux
+          cd test_rel
+          test -f cmds.json
           mkdir ./cppcheck_cache
-          cppcheck --inline-suppr --project="$THECMDFILE" --check-level=normal -j4 --cppcheck-build-dir="$PWD"/cppcheck_cache -q --suppress='*:'"$CONDA_PREFIX"'/include/*' --error-exitcode=1
+          if [ "$RUNNER_OS" == "macOS" ]; then
+            #macos runners are already slow enough
+            export tmp_cppcheck_level="normal"
+          else
+            export tmp_cppcheck_level="exhaustive"
+          fi
+          cppcheck --inline-suppr --project=cmds.json --check-level=${tmp_cppcheck_level} -j4 --cppcheck-build-dir="$PWD"/cppcheck_cache -q --suppress='*:'"$CONDA_PREFIX"'/include/*' --error-exitcode=1