Merge branch 'main' into CURA-11482_sentry

.github/workflows/gcodeanalyzer.yml

@@ -179,7 +179,7 @@ jobs:
         run: |
           for file in `ls ../NightlyTestModels/*.stl`;
           do
-              ( time ./build/Release/CuraEngine slice --force-read-parent --force-read-nondefault -v -p -j ../Cura/resources/definitions/ultimaker_s3.def.json -l $file -o ../`basename $file .stl`.gcode ) 2> $file.time
+              ( time ./build/Release/CuraEngine slice --force-read-parent --force-read-nondefault -v -p -j ../Cura/resources/definitions/ultimaker_s3.def.json -l $file -o ../`basename $file .stl`.gcode ) 2> ../`basename $file .stl`.time
           done
         working-directory: CuraEngine
 
@@ -205,7 +205,7 @@ jobs:
               if ext.lower() != ".gcode":
                   continue
               infilename = os.path.join(folder_path, filename)
-              with open(infilename + ".time", "r") as f:
+              with open(infilename.split(".")[0] + ".time", "r") as f:
                     timer = float(re.match(r"^.*?cpu (\d+\.\d+)", f.read())[1])
           
               frame = GCodeAnalyzer.DataFrame(infilename)

tests/LayerPlanTest.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2023 UltiMaker
+// Copyright (c) 2024 UltiMaker
 // CuraEngine is released under the terms of the AGPLv3 or higher
 
 #include "LayerPlan.h" //The code under test.
@@ -124,6 +124,8 @@ class LayerPlanTest : public testing::Test
         settings->add("prime_tower_line_width", "0.48");
         settings->add("prime_tower_min_volume", "10");
         settings->add("prime_tower_size", "40");
+        settings->add("raft_interface_layers", "1");
+        settings->add("raft_surface_layers", "1");
         settings->add("raft_base_line_width", "0.401");
         settings->add("raft_base_acceleration", "5001");
         settings->add("raft_base_jerk", "5.1");