Skip to content

Commit 9ac0329

Browse files
authored
Merge branch 'main' into CURA-12065_fix-retraction-disabled-with-zhop
2 parents 7839196 + 39de950 commit 9ac0329

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
benchmark:
3838
uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
3939
with:
40-
conan_extra_args: "-o \"curaengine/*:enable_benchmarks=True\""
40+
conan_extra_args: "-c tools.build:skip_test=False -o \"curaengine/*:enable_benchmarks=True\""
4141
benchmark_cmd: "benchmark/benchmarks --benchmark_format=json --benchmark_out=benchmark_result.json"
4242
name: "C++ Benchmark"
4343
output_file_path: "benchmark_result.json"

.github/workflows/stress_benchmark.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
benchmark:
3737
uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
3838
with:
39-
conan_extra_args: "-o \"curaengine/*:enable_benchmarks=True\""
39+
conan_extra_args: "-c tools.build:skip_test=False -o \"curaengine/*:enable_benchmarks=True\""
4040
benchmark_cmd: "stress_benchmark/stress_benchmark -o benchmark_result.json"
4141
name: "Stress Benchmark"
4242
output_file_path: "benchmark_result.json"

0 commit comments

Comments
 (0)