Merge branch '5.1' into CURA-9459_standard_default_install_path

4 files changed, 21 insertions, 100 deletions

diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml
index 70f28b0290..ea1915c5cb 100644
--- a/.github/workflows/conan-recipe-version.yml
+++ b/.github/workflows/conan-recipe-version.yml
@@ -68,7 +68,7 @@ jobs:
                     from git import Repo
                     
                     repo = Repo('.')
-                    user = "${{ github.repository_owner }}"
+                    user = "${{ github.repository_owner }}".lower()
                     project_name = "${{ inputs.project_name }}"
                     event_name = "${{ github.event_name }}"
                     issue_number = "${{ github.ref }}".split('/')[2]
diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml
index a95f6a60cc..70f4c000b8 100644
--- a/.github/workflows/cura-installer.yml
+++ b/.github/workflows/cura-installer.yml
@@ -209,3 +209,16 @@ jobs:
                         dist/*.AppImage
                         dist/*.asc
                     retention-days: 2
+
+    notify-export:
+        if: ${{ always() }}
+        needs: [ cura-installer-create ]
+
+        uses: ultimaker/cura/.github/workflows/notify.yml@main
+        with:
+            success: ${{ contains(join(needs.*.result, ','), 'success') }}
+            success_title: "Create the Cura distributions"
+            success_body: "Installers for ${{ inputs.cura_conan_version }}"
+            failure_title: "Failed to create the Cura distributions"
+            failure_body: "Failed to create at least 1 installer for ${{ inputs.cura_conan_version }}"
+        secrets: inherit
diff --git a/conandata.yml b/conandata.yml
index 756cb09db3..6e2a5f4f27 100644
--- a/conandata.yml
+++ b/conandata.yml
@@ -182,95 +182,3 @@
             Windows: "./icons/Cura.ico"
             Macos: "./icons/cura.icns"
             Linux: "./icons/cura-128.png"
-"5.1.0-beta":
-    requirements:
-        - "arcus/(latest)@ultimaker/stable"
-        - "curaengine/(latest)@ultimaker/stable"
-        - "savitar/(latest)@ultimaker/stable"
-        - "pynest2d/(latest)@ultimaker/stable"
-        - "uranium/(latest)@ultimaker/stable"
-        - "fdm_materials/(latest)@ultimaker/stable"
-        - "cura_binary_data/(latest)@ultimaker/stable"
-        - "cpython/3.10.4"
-    runinfo:
-        entrypoint: "cura_app.py"
-    pyinstaller:
-        datas:
-            cura_plugins:
-                package: "cura"
-                src: "plugins"
-                dst: "share/cura/plugins"
-            cura_resources:
-                package: "cura"
-                src: "resources"
-                dst: "share/cura/resources"
-            uranium_plugins:
-                package: "uranium"
-                src: "plugins"
-                dst: "share/uranium/plugins"
-            uranium_resources:
-                package: "uranium"
-                src: "resources"
-                dst: "share/uranium/resources"
-            uranium_um_qt_qml_um:
-                package: "uranium"
-                src: "site-packages/UM/Qt/qml/UM"
-                dst: "PyQt6/Qt6/qml/UM"
-            cura_binary_data:
-                package: "cura_binary_data"
-                src: "resources/cura/resources"
-                dst: "share/cura/resources"
-            uranium_binary_data:
-                package: "cura_binary_data"
-                src: "resources/uranium/resources"
-                dst: "share/uranium/resources"
-            windows_binary_data:
-                package: "cura_binary_data"
-                src: "windows"
-                dst: "share/windows"
-            fdm_materials:
-                package: "fdm_materials"
-                src: "materials"
-                dst: "share/cura/resources/materials"
-            tcl:
-                package: "tcl"
-                src: "lib/tcl8.6"
-                dst: "tcl"
-            tk:
-                package: "tk"
-                src: "lib/tk8.6"
-                dst: "tk"
-        binaries:
-            curaengine:
-                package: "curaengine"
-                src: "bin"
-                dst: "."
-                binary: "CuraEngine"
-        hiddenimports:
-            - "pySavitar"
-            - "pyArcus"
-            - "pynest2d"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "logging.handlers"
-            - "zeroconf"
-            - "fcntl"
-            - "stl"
-            - "serial"
-        collect_all:
-            - "cura"
-            - "UM"
-            - "serial"
-            - "Charon"
-            - "sqlite3"
-            - "trimesh"
-            - "win32ctypes"
-            - "PyQt6"
-            - "PyQt6.QtNetwork"
-            - "PyQt6.sip"
-            - "stl"
-        icon:
-            Windows: "./icons/Cura.ico"
-            Macos: "./icons/cura.icns"
-            Linux: "./icons/cura-128.png"
diff --git a/conanfile.py b/conanfile.py
index 99b2fb1fe4..b7164ecf56 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -31,7 +31,7 @@ class CuraConan(ConanFile):
 
     # FIXME: Remove specific branch once merged to main
     # Extending the conanfile with the UMBaseConanfile https://github.com/Ultimaker/conan-ultimaker-index/tree/CURA-9177_Fix_CI_CD/recipes/umbase
-    python_requires = "umbase/0.1.2@ultimaker/testing"
+    python_requires = "umbase/0.1.4@ultimaker/testing"
     python_requires_extend = "umbase.UMBaseConanfile"
 
     options = {
@@ -138,7 +138,7 @@ class CuraConan(ConanFile):
                 cura_digital_factory_url = self._digital_factory_url))
 
     def _generate_pyinstaller_spec(self, location, entrypoint_location, icon_path, entitlements_file):
-        pyinstaller_metadata = self._um_data(self.version)["pyinstaller"]
+        pyinstaller_metadata = self._um_data(self.version, self.channel)["pyinstaller"]
         datas = [(str(self._base_dir.joinpath("conan_install_info.json")), ".")]
         for data in pyinstaller_metadata["datas"].values():
             if "package" in data:  # get the paths from conan package
@@ -224,7 +224,7 @@ class CuraConan(ConanFile):
             raise ConanInvalidConfiguration("Only versions 5+ are support")
 
     def requirements(self):
-        for req in self._um_data(self.version)["requirements"]:
+        for req in self._um_data(self.version, self.channel)["requirements"]:
             self.requires(req)
 
     def layout(self):
@@ -243,8 +243,8 @@ class CuraConan(ConanFile):
         if self.options.devtools:
             entitlements_file = "'{}'".format(Path(self.source_folder, "packaging", "dmg", "cura.entitlements"))
             self._generate_pyinstaller_spec(location = self.generators_folder,
-                                            entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data(self.version)["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
-                                            icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
+                                            entrypoint_location = "'{}'".format(Path(self.source_folder, self._um_data(self.version, self.channel)["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
+                                            icon_path = "'{}'".format(Path(self.source_folder, "packaging", self._um_data(self.version, self.channel)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
                                             entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
 
     def imports(self):
@@ -341,8 +341,8 @@ echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV
 
         entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "dmg", "cura.entitlements"))
         self._generate_pyinstaller_spec(location = self._base_dir,
-                                        entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data(self.version)["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
-                                        icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data(self.version)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
+                                        entrypoint_location = "'{}'".format(Path(self.cpp_info.bin_paths[0], self._um_data(self.version, self.channel)["runinfo"]["entrypoint"])).replace("\\", "\\\\"),
+                                        icon_path = "'{}'".format(Path(self.cpp_info.res_paths[2], self._um_data(self.version, self.channel)["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"),
                                         entitlements_file = entitlements_file if self.settings.os == "Macos" else "None")
 
     def package(self):