From 8f1ad7e6b4caa2968b288a9341b74c6f91aa3a17 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 18:21:23 +0200 Subject: [PATCH 1/4] Use umbase 0.1.4 Contributes to CURA-9365 --- conandata.yml | 92 --------------------------------------------------- conanfile.py | 14 ++++---- 2 files changed, 7 insertions(+), 99 deletions(-) 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): From 3edd748c503d894be8de569b086e75fb30b3e4fc Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 15 Jul 2022 07:55:05 +0200 Subject: [PATCH 2/4] Use reqs for 5.1.0-beta Contributes to CURA-9365 (cherry picked from commit 12eb5f15d16ebc908938644d221a2cae5d3c39a2) --- conandata.yml | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/conandata.yml b/conandata.yml index 6e2a5f4f27..23ef1c4215 100644 --- a/conandata.yml +++ b/conandata.yml @@ -182,3 +182,95 @@ Windows: "./icons/Cura.ico" Macos: "./icons/cura.icns" Linux: "./icons/cura-128.png" +"5.1.0-beta": + requirements: + - "arcus/5.1.0@ultimaker/stable" + - "curaengine/5.1.0@ultimaker/stable" + - "savitar/5.1.0@ultimaker/stable" + - "pynest2d/5.1.0@ultimaker/stable" + - "uranium/5.1.0@ultimaker/stable" + - "fdm_materials/5.1.0@ultimaker/stable" + - "cura_binary_data/5.1.0@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" From dbc62492e7c82140b3664bcb5ec096da1b99d678 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 15 Jul 2022 08:00:19 +0200 Subject: [PATCH 3/4] Use latest for beta Contributes to CURA-9365 --- conandata.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/conandata.yml b/conandata.yml index 23ef1c4215..756cb09db3 100644 --- a/conandata.yml +++ b/conandata.yml @@ -184,13 +184,13 @@ Linux: "./icons/cura-128.png" "5.1.0-beta": requirements: - - "arcus/5.1.0@ultimaker/stable" - - "curaengine/5.1.0@ultimaker/stable" - - "savitar/5.1.0@ultimaker/stable" - - "pynest2d/5.1.0@ultimaker/stable" - - "uranium/5.1.0@ultimaker/stable" - - "fdm_materials/5.1.0@ultimaker/stable" - - "cura_binary_data/5.1.0@ultimaker/stable" + - "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" From a0d775b90e01a9b9d1b003e1177d694e832894c7 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 15 Jul 2022 10:03:37 +0200 Subject: [PATCH 4/4] Update workflows Contributes to CURA-9365 --- .github/workflows/conan-package.yml | 3 --- .github/workflows/notify.yml | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index a96afaedab..666ea5fe40 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -61,7 +61,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'macos-10.15' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit @@ -75,7 +74,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'ubuntu-20.04' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit @@ -89,7 +87,6 @@ jobs: recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'windows-2022' python_version: '3.10.x' - conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true secrets: inherit diff --git a/.github/workflows/notify.yml b/.github/workflows/notify.yml index 3d421905d0..370b54c78b 100644 --- a/.github/workflows/notify.yml +++ b/.github/workflows/notify.yml @@ -36,7 +36,7 @@ jobs: uses: rtCamp/action-slack-notify@v2 env: SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: #00ff00 + SLACK_COLOR: green SLACK_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true SLACK_TITLE: ${{ inputs.success_title }} SLACK_MESSAGE: ${{ inputs.success_body }} @@ -47,7 +47,7 @@ jobs: uses: rtCamp/action-slack-notify@v2 env: SLACK_USERNAME: ${{ github.repository }} - SLACK_COLOR: #ff0000 + SLACK_COLOR: red SLACK_ICON: https://github.com/Ultimaker/Cura/blob/main/icons/cura-128.png?raw=true SLACK_TITLE: ${{ inputs.failure_title }} SLACK_MESSAGE: ${{ inputs.failure_body }}