Merge branch 'main' into CURA-12065_fix-retraction-disabled-with-zhop

Ultimaker · Dec 20, 2024 · 9ac0329 · 9ac0329
2 parents 7839196 + 39de950
commit 9ac0329
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -37,7 +37,7 @@ jobs:
   benchmark:
     uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
     with:
-      conan_extra_args: "-o \"curaengine/*:enable_benchmarks=True\""
+      conan_extra_args: "-c tools.build:skip_test=False -o \"curaengine/*:enable_benchmarks=True\""
       benchmark_cmd: "benchmark/benchmarks --benchmark_format=json --benchmark_out=benchmark_result.json"
       name: "C++ Benchmark"
       output_file_path: "benchmark_result.json"

diff --git a/.github/workflows/stress_benchmark.yml b/.github/workflows/stress_benchmark.yml
@@ -36,7 +36,7 @@ jobs:
   benchmark:
     uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
     with:
-      conan_extra_args: "-o \"curaengine/*:enable_benchmarks=True\""
+      conan_extra_args: "-c tools.build:skip_test=False -o \"curaengine/*:enable_benchmarks=True\""
       benchmark_cmd: "stress_benchmark/stress_benchmark -o benchmark_result.json"
       name: "Stress Benchmark"
       output_file_path: "benchmark_result.json"