Addressed review comments

Contribute to NP-637
Ultimaker · Dec 10, 2024 · 262c57f · 262c57f
1 parent 8a77e66
commit 262c57f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/gcodeanalyzer.yml b/.github/workflows/gcodeanalyzer.yml
@@ -75,6 +75,7 @@ jobs:
 
       - name: Collect STL-files, run CuraEngine, output GCode-files
         run: |
+          source build/Release/generators/conanrun.sh
           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

diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -47,7 +47,7 @@ jobs:
 
   npm-package:
     needs: [ conan-package ]
-    if: ${{ github.event_name == 'push' && (github.ref_name == 'main' || contains(github.ref_name, 'NP-') || github.ref_name == '5.10') }}
+    if: ${{ github.event_name == 'push' && (github.ref_name == 'main' || contains(github.ref_name, 'NP-') || github.ref_name == '5.10') }}  # FIXME: have a more generic way to determine release branches
     uses: ultimaker/cura-workflows/.github/workflows/npm-package.yml@NP-637_conan_v2_wasm
     with:
       package_version_full: ${{ needs.conan-package.outputs.package_version_full }}