Fix writing of profiler data on CI

Author: aspeake

.github/workflows/integration_tests.yml

@@ -64,13 +64,14 @@ jobs:
             steps=("ecm_prep" "run")
             for step in "${steps[@]}"; do
               psrecord --log memory_log_${step}.txt --include-children --interval 1 "python tests/integration_testing/run_workflow.py --run_step $step --yaml tests/integration_testing/integration_test.yml --with_profiler"
-              (echo -e; echo "# Elapsed time,CPU (%),Peak Real (MB),Peak Virtual (MB)"; grep -v "time" memory_log_${step}.txt | sort -k3 -n -r | head -n 1 | column -t | tr -s '[:blank:]' ',') >> tests/integration_testing/results/profile_${step}.csv
-              mv memory_log_${step}.txt ./tests/integration_testing/results/
+              (echo -e; echo "# Elapsed time,CPU (%),Peak Real (MB),Peak Virtual (MB)"; grep -v "time" memory_log_${step}.txt | sort -k3 -n -r | head -n 1 | column -t | tr -s '[:blank:]' ',') >> results/profile_${step}.csv
+              mv memory_log_${step}.txt ./results/
             done
           else
             python tests/integration_testing/run_workflow.py --yaml tests/integration_testing/integration_test.yml
           fi
-          mv -f ./results/* ./tests/integration_testing/results/
+          rm -rf ./tests/integration_testing/results/*
+          mv ./results/* ./tests/integration_testing/results/
       - name: Compare integration test results
         run: |
           git fetch origin master

tests/integration_testing/run_workflow.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 from pathlib import Path
 from argparse import ArgumentParser
+from scout.config import FilePaths as fp
 import io
 import sys
 import logging
@@ -28,21 +29,19 @@ def run_workflow(config: str = "", run_step: str = None, with_profiler: bool = F
                                         compute time and peak memory. Defaults to False.
     """
 
-    results_dir = Path(__file__).parent / "results"
-
     # Run ecm_prep.py
     if run_step == "ecm_prep" or run_step is None:
         opts = ecm_args(["-y", config])
         if with_profiler:
-            run_with_profiler(ecm_prep.main, opts, results_dir / "profile_ecm_prep.csv")
+            run_with_profiler(ecm_prep.main, opts, fp.RESULTS / "profile_ecm_prep.csv")
         else:
             ecm_prep.main(opts)
 
     # Run run.py
     if run_step == "run" or run_step is None:
         opts = run.parse_args(["-y", config])
         if with_profiler:
-            run_with_profiler(run.main, opts, results_dir / "profile_run.csv")
+            run_with_profiler(run.main, opts, fp.RESULTS / "profile_run.csv")
         else:
             run.main(opts)