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

Ultimaker · Dec 20, 2024 · 7839196 · 7839196
2 parents 6bd4aa3 + bef3141
commit 7839196
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 31 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -38,9 +38,9 @@ jobs:
     uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
     with:
       conan_extra_args: "-o \"curaengine/*:enable_benchmarks=True\""
-      benchmark_cmd: "./build/Release/benchmark/benchmarks --benchmark_format=json --benchmark_out=benchmark_result.json"
+      benchmark_cmd: "benchmark/benchmarks --benchmark_format=json --benchmark_out=benchmark_result.json"
       name: "C++ Benchmark"
-      output_file_path: "build/Release/benchmark_result.json"
+      output_file_path: "benchmark_result.json"
       data_dir: "dev/bench"
       tool: "googlecpp"
       alert_threshold: "150%"

diff --git a/.github/workflows/gcodeanalyzer.yml b/.github/workflows/gcodeanalyzer.yml
@@ -24,20 +24,13 @@ permissions:
   contents: write
   deployments: write
 
-# TODO: Make cura-workflows/benchmark.yml generic enough to fit the gcodeanalyzer benchmark
 
 jobs:
   check_actor:
     uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@main
     secrets: inherit
 
-  conan-recipe-version:
-    needs: [ check_actor ]
-    if: ${{ needs.check_actor.outputs.proceed == 'true' }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
-
   gcodeanalyzer:
-    needs: [ conan-recipe-version ]
     name: Run GCodeAnalyzer on the engine
     runs-on: ubuntu-latest
     steps:
@@ -64,17 +57,19 @@ jobs:
           fetch-depth: 1
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Install dependencies
-        run: conan install . ${{ needs.conan-recipe-version.outputs.version_full }} -s "*:build_type=Release" --build=missing --update -g VirtualRunEnv -c tools.build:skip_test=True -o with_cura_resources=True
-
-      - name: Build CuraEngine and tests
+      - name: Install Python requirements
         run: |
-          source build/Release/generators/conanbuild.sh
-          cmake --preset release
-          cmake --build --preset release
+          pip install pandas
+          pip install git+https://github.com/ultimaker/libcharon@CURA-9495_analyzer_requisites#egg=charon
+
+      - name: Install dependencies and build CuraEngine
+        run: conan build . -s build_type=Release --build=missing --update -g VirtualRunEnv -o "curaengine/*:with_cura_resources=True"
 
       - name: Collect STL-files, run CuraEngine, output GCode-files
         run: |
+          source build/Release/generators/conanrun.sh
+          echo $CURA_RESOURCES
+          ls $CURA_RESOURCES
           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> `basename $file .stl`.time
@@ -83,6 +78,8 @@ jobs:
 # TODO: Move this to GCodeAnalyzer
       - name: Run GCodeAnalyzer on generated GCode files
         id: gcode_out
+        shell: python
+        working-directory: GCodeAnalyzer
         run: |
           import sys
           import os
@@ -205,8 +202,6 @@ jobs:
           
           with open("../output.json", "w") as outfile:
               outfile.write(json.dumps(jzon))
-        shell: python
-        working-directory: GCodeAnalyzer
 
       - name: Store benchmark result
         uses: benchmark-action/github-action-benchmark@v1

diff --git a/.github/workflows/stress_benchmark.yml b/.github/workflows/stress_benchmark.yml
@@ -27,30 +27,19 @@ permissions:
   contents: write
   deployments: write
 
-env:
-  CONAN_LOGIN_USERNAME: ${{ secrets.CONAN_USER }}
-  CONAN_PASSWORD: ${{ secrets.CONAN_PASS }}
-
 
 jobs:
   check_actor:
     uses: ultimaker/cura-workflows/.github/workflows/check-actor.yml@main
     secrets: inherit
 
-  conan-recipe-version:
-    needs: [ check_actor ]
-    if: ${{ needs.check_actor.outputs.proceed == 'true' }}
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
-
   benchmark:
-    needs: [ conan-recipe-version ]
     uses: ultimaker/cura-workflows/.github/workflows/benchmark.yml@main
     with:
-      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
-      conan_extra_args: "-o curaengine:enable_benchmarks=True"
+      conan_extra_args: "-o \"curaengine/*:enable_benchmarks=True\""
       benchmark_cmd: "stress_benchmark/stress_benchmark -o benchmark_result.json"
       name: "Stress Benchmark"
-      output_file_path: "build/Release/benchmark_result.json"
+      output_file_path: "benchmark_result.json"
       data_dir: "dev/stress_bench"
       tool: "customSmallerIsBetter"
     secrets: inherit