Merge branch 'main' into PurgeLines

Ultimaker · Dec 21, 2024 · bfc0139 · bfc0139
2 parents 035ae14 + 382b98e
commit bfc0139
Show file tree

Hide file tree

Showing 137 changed files with 216 additions and 210 deletions.
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -6,10 +6,14 @@ on:
     inputs:
       cura_conan_version:
         description: 'Cura Conan Version'
-        default: 'cura/[*]@ultimaker/testing'
+        default: ''
+        type: string
+      package_overrides:
+        description: 'List of specific packages to be used (space-separated)'
+        default: ''
         type: string
       conan_args:
-        description: 'Conan args, e.g. --requires'
+        description: 'Conan args'
         default: ''
         type: string
       enterprise:
@@ -28,6 +32,7 @@ jobs:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installers.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
+      package_overrides: ${{ inputs.package_overrides }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging  }}

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -6,11 +6,14 @@ on:
     inputs:
       cura_conan_version:
         description: 'Cura Conan Version'
-        default: 'cura/latest@ultimaker/testing'
-        required: true
+        default: ''
+        type: string
+      package_overrides:
+        description: 'List of specific packages to be used (space-separated)'
+        default: ''
         type: string
       conan_args:
-        description: 'Conan args, e.g. --requires'
+        description: 'Conan args'
         default: ''
         required: false
         type: string
@@ -38,6 +41,7 @@ jobs:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
+      package_overrides: ${{ inputs.package_overrides }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging }}

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -6,11 +6,14 @@ on:
     inputs:
       cura_conan_version:
         description: 'Cura Conan Version'
-        default: 'cura/latest@ultimaker/testing'
-        required: true
+        default: ''
+        type: string
+      package_overrides:
+        description: 'List of specific packages to be used (space-separated)'
+        default: ''
         type: string
       conan_args:
-        description: 'Conan args: eq.: --require-override'
+        description: 'Conan args'
         default: ''
         required: false
         type: string
@@ -47,6 +50,7 @@ jobs:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
+      package_overrides: ${{ inputs.package_overrides }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging }}

diff --git a/.github/workflows/nightly-stable.yml b/.github/workflows/nightly-stable.yml
@@ -11,6 +11,6 @@ jobs:
     uses: ./.github/workflows/nightly.yml
     with:
       cura_conan_version: "cura/[*]@ultimaker/stable"
-      release_tag: "nightly"
+      release_tag: "nightly-stable"
       caller_workflow: "nightly-stable.yml"
     secrets: inherit
diff --git a/.github/workflows/nightly-testing.yml b/.github/workflows/nightly-testing.yml
@@ -11,6 +11,6 @@ jobs:
     uses: ./.github/workflows/nightly.yml
     with:
       cura_conan_version: "cura/[*]@ultimaker/testing"
-      release_tag: "nightly-stable" # Fixed version, we reuse the same tag forever
+      release_tag: "nightly-testing" # Fixed version, we reuse the same tag forever
       caller_workflow: "nightly-testing.yml"
     secrets: inherit
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Rename the installers
         id: rename-installers
         working-directory: installers
-        run: python ./Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT
+        run: python ../Cura-workflows/runner_scripts/rename_installers.py --tag "nightly" >> $GITHUB_OUTPUT
 
       - name: create the release notes
         shell: python
@@ -61,16 +61,14 @@ jobs:
               f.write(release_notes.render(
                 timestamp=str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")),
                 caller_workflow=caller_workflow,
-                branch="" if is_main else short_version,
-                branch_specific="" is_main else f"?branch={short_version}",
+                branch_specific="" if is_main else f"?branch={short_version}",
               ))
 
       - name: Update nightly release description and binaries
-        working-directory: installers
         run: |
           gh release edit ${{ inputs.release_tag }} --title "${{ steps.rename-installers.outputs.cura_version }}" --notes-file release-notes.md
 
-          for file in "*"; do
+          for file in "installers/*"; do
             gh release upload ${{ inputs.release_tag }} $file --clobber
           done
         env:

diff --git a/.github/workflows/nightly_release_notes.md.jinja b/.github/workflows/nightly_release_notes.md.jinja
@@ -4,33 +4,32 @@
 
 |               |                                                                                            |
 |--------------:|--------------------------------------------------------------------------------------------|
-| **Nightlies** | [![nightly {{ branch }}](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}
-?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) |
+| **Nightlies** | [![nightly](https://github.com/Ultimaker/Cura/actions/workflows/{{ caller_workflow }}/badge.svg{{ branch_specific }}?event=schedule)](https://github.com/Ultimaker/Cura/actions/workflows/installers.yml) |
 
 # Unit Test results
 
 |                                |                                                                                                                                                                                                                               |
 |-------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|                   **Cura {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml)                                                                |
-|             **CuraEngine {{ branch }}** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml)                                                    |
-|                **Uranium {{ branch }}** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml)                                                          |
-| **CuraEngine GradualFlow 0.1** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) |
-|  **synsepalum-dulcificum 0.1** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml)                   |
+|                   **Cura** | [![unit-test](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/unit-test.yml)                                                                |
+|             **CuraEngine** | [![unit-test](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/unit-test.yml)                                                    |
+|                **Uranium** | [![unit-test](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/unit-test.yml)                                                          |
+| **CuraEngine GradualFlow** | [![unit-test](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/unit-test.yml) |
+|  **synsepalum-dulcificum** | [![unit-test](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/unit-test.yml)                   |
 |                 **libSavitar** | [![unit-test](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/unit-test.yml)                                                    |
 |                  **libnest2d** | [![unit-test](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml/badge.svg)](https://github.com/Ultimaker/libnest2d/actions/workflows/unit-test.yml)                                                      |
 
 # Conan packages
 
 |                                     |                                                                                                                                                                                                                                           |
 |------------------------------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-|                        **Cura {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml)                                                     |
-|                  **CuraEngine {{ branch }}** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/conan-package.yml)                                         |
-|                     **Uranium {{ branch }}** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml)                                               |
-|               **fdm_materials {{ branch }}** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml)                                   |
-|            **cura-binary-data {{ branch }}** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml)                             |
-|      **CuraEngine GradualFlow 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) |
-|       **synsepalum-dulcificum 0.1** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml)                   |
-| **CuraEngine gRPC definitions 0.1** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg?branch=0.1)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml)       |
+|                        **Cura** | [![conan-package](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Cura/actions/workflows/conan-package.yml)                                                     |
+|                  **CuraEngine** | [![conan-package](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/CuraEngine/actions/workflows/package.yml)                                         |
+|                     **Uranium** | [![conan-package](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/Uranium/actions/workflows/conan-package.yml)                                               |
+|               **fdm_materials** | [![conan-package](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/fdm_materials/actions/workflows/conan-package.yml)                                   |
+|            **cura-binary-data** | [![conan-package](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml/badge.svg{{ branch_specific }})](https://github.com/Ultimaker/cura-binary-data/actions/workflows/conan-package.yml)                             |
+|      **CuraEngine GradualFlow** | [![conan-package](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_plugin_gradual_flow/actions/workflows/conan-package.yml) |
+|       **synsepalum-dulcificum** | [![conan-package](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/synsepalum-dulcificum/actions/workflows/conan-package.yml)                   |
+| **CuraEngine gRPC definitions** | [![conan-package](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/CuraEngine_grpc_definitions/actions/workflows/conan-package.yml)       |
 |                        **libArcus** | [![conan-package](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libArcus/actions/workflows/conan-package.yml)                                                        |
 |                         **pyArcus** | [![conan-package](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/pyArcus/actions/workflows/conan-package.yml)                                                          |
 |                      **libSavitar** | [![conan-package](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml/badge.svg)](https://github.com/Ultimaker/libSavitar/actions/workflows/conan-package.yml)                                                    |

diff --git a/.github/workflows/printer-linter-format.yml b/.github/workflows/printer-linter-format.yml
@@ -1,34 +1,21 @@
 name: printer-linter-format
 
 on:
-    push:
-        paths:
-            - 'resources/definitions/**'
-            - 'resources/extruders/**'
-            - 'resources/intent/**'
-            - 'resources/quality/**'
-            - 'resources/variants/**'
+  push:
+    paths:
+      - 'resources/definitions/**'
+      - 'resources/extruders/**'
+      - 'resources/intent/**'
+      - 'resources/quality/**'
+      - 'resources/variants/**'
 
 jobs:
-    printer-linter-format:
-        name: Printer linter auto format
-
-        runs-on: ubuntu-latest
-        steps:
-            -   name: Setup the build environment
-                uses: ultimaker/cura-workflows/.github/actions/setup-build-environment@main
-
-            -   uses: greguintow/get-diff-action@v7
-                with:
-                    PATTERNS: |
-                        resources/+(definitions|extruders)/*.def.json
-                        resources/+(intent|quality|variants)/**/*.inst.cfg
-
-            -   name: Format file
-                if: env.GIT_DIFF && !env.MATCHED_FILES
-                run: python printer-linter/src/terminal.py --format ${{ env.GIT_DIFF_FILTERED }}
-
-            -   uses: stefanzweifel/git-auto-commit-action@v4
-                if: env.GIT_DIFF && !env.MATCHED_FILES
-                with:
-                    commit_message: "Applied printer-linter format"
+  printer-linter-format:
+    name: Printer linter auto format
+    uses: ultimaker/cura-workflows/.github/workflows/lint-formatter.yml@main
+    with:
+      file_patterns: |
+        resources/+(definitions|extruders)/*.def.json
+        resources/+(intent|quality|variants)/**/*.inst.cfg
+      command: python printer-linter/src/terminal.py --format
+      commit_message: "Apply printer-linter format"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -6,11 +6,14 @@ on:
     inputs:
       cura_conan_version:
         description: 'Cura Conan Version'
-        default: 'cura/latest@ultimaker/testing'
-        required: true
+        default: ''
+        type: string
+      package_overrides:
+        description: 'List of specific packages to be used (space-separated)'
+        default: ''
         type: string
       conan_args:
-        description: 'Conan args: eq.: --requires'
+        description: 'Conan args'
         default: ''
         required: false
         type: string
@@ -38,6 +41,7 @@ jobs:
     uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main
     with:
       cura_conan_version: ${{ inputs.cura_conan_version }}
+      package_overrides: ${{ inputs.package_overrides }}
       conan_args: ${{ inputs.conan_args }}
       enterprise: ${{ inputs.enterprise }}
       staging: ${{ inputs.staging }}

diff --git a/README.md b/README.md
@@ -2,8 +2,6 @@
 
 <div align = center>
 
-# ⚠️ ⚠️ On 03-12-2024, we will start merging branches on all the Cura-related repositories, that contain a migration of our Conan recipes to use Conan 2, and also a huge rework on many GitHub workflows. Unfortunately, we cannot test everything until it is merged, so it is very likely that some existing workflows will stop working. If you are a developer, you may also encounter troubles when updating your branches or updating your Conan dependencies. This message will be removed when the situation is stable enough. After that, please open new issues if you are still in trouble with the new recipes/workflows. Sorry for the inconvenience. ⚠️ ⚠️
-
 [![Badge Issues]][Issues]   
 [![Badge PullRequests]][PullRequests]   
 [![Badge Closed]][Closed]

diff --git a/UltiMaker-Cura.spec.jinja b/UltiMaker-Cura.spec.jinja
@@ -28,7 +28,7 @@ a = Analysis(
     binaries=binaries,
     datas=datas,
     hiddenimports=hiddenimports,
-    hookspath=[],
+    hookspath=["Cura-workflows/runner_scripts/pyinstaller_hooks"],
     hooksconfig={},
     runtime_hooks=[],
     excludes=[],