From 9ae3c6d4a2f56d38ee7d0267975cdac593f22314 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 21:45:55 +0000 Subject: [PATCH 01/88] Bump twisted from 21.2.0 to 23.8.0 Bumps [twisted](https://github.com/twisted/twisted) from 21.2.0 to 23.8.0. - [Release notes](https://github.com/twisted/twisted/releases) - [Changelog](https://github.com/twisted/twisted/blob/trunk/NEWS.rst) - [Commits](https://github.com/twisted/twisted/compare/twisted-21.2.0...twisted-23.8.0) --- updated-dependencies: - dependency-name: twisted dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index dfa974ef7d..f14d389b27 100644 --- a/requirements.txt +++ b/requirements.txt @@ -207,9 +207,9 @@ requests==2.22.0 \ --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \ --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 # twisted -Twisted==21.2.0 \ - --hash=sha256:77544a8945cf69b98d2946689bbe0c75de7d145cdf11f391dd487eae8fc95a12 \ - --hash=sha256:aab38085ea6cda5b378b519a0ec99986874921ee8881318626b0a3414bb2631e +Twisted==23.8.0 \ + --hash=sha256:3c73360add17336a622c0d811c2a2ce29866b6e59b1125fd6509b17252098a24 \ + --hash=sha256:b8bdba145de120ffb36c20e6e071cce984e89fba798611ed0704216fb7f884cd constantly==15.1.0 \ --hash=sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 \ --hash=sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d From 1f5a18d7d75d89de3add89b4e13a1ffe5d825d8c Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Wed, 8 May 2024 14:31:33 +0200 Subject: [PATCH 02/88] added resolve function to take the values from material profiles --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 6f9b4de7fd..35fd6df843 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6180,6 +6180,7 @@ "type": "bool", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false, "children": From 22c17c68acef57c9ad3753c9f319904ae5c56dbb Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 8 May 2024 16:26:07 +0200 Subject: [PATCH 03/88] Create um_f4_global_Fast_Quality.inst.cfg --- .../um_f4_global_Fast_Quality.inst.cfg | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 resources/quality/ultimaker_factor4/um_f4_global_Fast_Quality.inst.cfg diff --git a/resources/quality/ultimaker_factor4/um_f4_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_global_Fast_Quality.inst.cfg new file mode 100644 index 0000000000..44783fa788 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_global_Fast_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_factor4 +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = fast +setting_version = 23 +type = quality +weight = -1 + +[values] +layer_height = =round(0.15 * material_shrinkage_percentage_z / 100, 5) + From 674d28a37198e5512357357843a8f38f100d820b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 14 May 2024 10:03:12 +0200 Subject: [PATCH 04/88] Add resolve functions for raft_*_remove_inside_corners settings --- resources/definitions/fdmprinter.def.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 35fd6df843..5a91188eee 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6193,6 +6193,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_base_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -6204,6 +6205,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_interface_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -6215,6 +6217,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_surface_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false } From b75f168c555f9e963bf195b48fbad812b25ac743 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 14 May 2024 14:54:00 +0200 Subject: [PATCH 05/88] Fix wrong placement of objects children when saving to 3MF We now ignore the auto-centering of meshes for children objects, because it messes up with their relative position with their parent. Only the top-level objects needs to be centered, the children will follow. CURA-11902 --- plugins/3MFWriter/ThreeMFWriter.py | 33 ++++++++++++++++++------------ 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index d33f0e374a..1459806045 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -96,7 +96,8 @@ class ThreeMFWriter(MeshWriter): @staticmethod def _convertUMNodeToSavitarNode(um_node, transformation = Matrix(), - exported_settings: Optional[Dict[str, Set[str]]] = None): + exported_settings: Optional[Dict[str, Set[str]]] = None, + center_mesh = False): """Convenience function that converts an Uranium SceneNode object to a SavitarSceneNode :returns: Uranium Scene node. @@ -111,16 +112,21 @@ class ThreeMFWriter(MeshWriter): savitar_node = Savitar.SceneNode() savitar_node.setName(um_node.getName()) - node_matrix = Matrix() + node_matrix = um_node.getLocalTransformation() mesh_data = um_node.getMeshData() - # compensate for original center position, if object(s) is/are not around its zero position - if mesh_data is not None: - extents = mesh_data.getExtents() - if extents is not None: - # We use a different coordinate space while writing, so flip Z and Y - center_vector = Vector(extents.center.x, extents.center.z, extents.center.y) - node_matrix.setByTranslation(center_vector) - node_matrix.multiply(um_node.getLocalTransformation()) + + if center_mesh: + node_matrix = Matrix() + # compensate for original center position, if object(s) is/are not around its zero position + if mesh_data is not None: + extents = mesh_data.getExtents() + if extents is not None: + # We use a different coordinate space while writing, so flip Z and Y + center_vector = Vector(extents.center.x, extents.center.y, extents.center.z) + node_matrix.setByTranslation(center_vector) + node_matrix.multiply(um_node.getLocalTransformation()) + else: + node_matrix = um_node.getLocalTransformation() matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix.preMultiply(transformation)) @@ -147,7 +153,7 @@ class ThreeMFWriter(MeshWriter): for key in changed_setting_keys: savitar_node.setSetting("cura:" + key, str(stack.getProperty(key, "value"))) else: - # We want to export only the specified settings + # We want to export only the specified settings if um_node.getName() in exported_settings: model_exported_settings = exported_settings[um_node.getName()] @@ -283,7 +289,8 @@ class ThreeMFWriter(MeshWriter): for root_child in node.getChildren(): savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(root_child, transformation_matrix, - exported_model_settings) + exported_model_settings, + center_mesh = True) if savitar_node: savitar_scene.addSceneNode(savitar_node) else: @@ -442,7 +449,7 @@ class ThreeMFWriter(MeshWriter): def sceneNodesToString(scene_nodes: [SceneNode]) -> str: savitar_scene = Savitar.Scene() for scene_node in scene_nodes: - savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(scene_node) + savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(scene_node, center_mesh = True) savitar_scene.addSceneNode(savitar_node) parser = Savitar.ThreeMFParser() scene_string = parser.sceneToString(savitar_scene) From 2e5e43291ee08efe136c7e4463cd009eeaa5f80e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 14 May 2024 16:27:16 +0200 Subject: [PATCH 06/88] Fix missing error message when slicing with disabled extruder Following the removal of the get/setMessage methods in the Job class, the StartSliceJob has not been updated and still used them. We now use a specific variable for storing the disabled extruders and properly display them. CURA-11904 --- plugins/CuraEngineBackend/CuraEngineBackend.py | 2 +- plugins/CuraEngineBackend/StartSliceJob.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index c73dee2fb0..dd7987bc42 100755 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -544,7 +544,7 @@ class CuraEngineBackend(QObject, Backend): if job.getResult() == StartJobResult.ObjectsWithDisabledExtruder: self._error_message = Message(catalog.i18nc("@info:status", - "Unable to slice because there are objects associated with disabled Extruder %s.") % job.getMessage(), + "Unable to slice because there are objects associated with disabled Extruder %s.") % job.getAssociatedDisabledExtruders(), title = catalog.i18nc("@info:title", "Unable to slice"), message_type = Message.MessageType.WARNING) self._error_message.show() diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 3a1d7ce431..9caadbdff6 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -146,6 +146,7 @@ class StartSliceJob(Job): self._slice_message: Arcus.PythonMessage = slice_message self._is_cancelled: bool = False self._build_plate_number: Optional[int] = None + self._associated_disabled_extruders: Optional[str] = None # cache for all setting values from all stacks (global & extruder) for the current machine self._all_extruders_settings: Optional[Dict[str, Any]] = None @@ -153,6 +154,9 @@ class StartSliceJob(Job): def getSliceMessage(self) -> Arcus.PythonMessage: return self._slice_message + def getAssociatedDisabledExtruders(self) -> Optional[str]: + return self._associated_disabled_extruders + def setBuildPlate(self, build_plate_number: int) -> None: self._build_plate_number = build_plate_number @@ -334,7 +338,7 @@ class StartSliceJob(Job): if has_model_with_disabled_extruders: self.setResult(StartJobResult.ObjectsWithDisabledExtruder) associated_disabled_extruders = {p + 1 for p in associated_disabled_extruders} - self.setMessage(", ".join(map(str, sorted(associated_disabled_extruders)))) + self._associated_disabled_extruders = ", ".join(map(str, sorted(associated_disabled_extruders))) return # There are cases when there is nothing to slice. This can happen due to one at a time slicing not being From 3fbc91112376d51498d93440c3a0df4d12fb4817 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 15 May 2024 09:09:29 +0200 Subject: [PATCH 07/88] Remove useless variable declaration The node_matrix is defined in the following if whatever the condition, so there is no need to define it first. CURA-11902 --- plugins/3MFWriter/ThreeMFWriter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 1459806045..5a9fa487fc 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -112,7 +112,6 @@ class ThreeMFWriter(MeshWriter): savitar_node = Savitar.SceneNode() savitar_node.setName(um_node.getName()) - node_matrix = um_node.getLocalTransformation() mesh_data = um_node.getMeshData() if center_mesh: From bd343c0abd892b9a2f84ae925c51d70564b61c4d Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 17 May 2024 11:45:58 +0200 Subject: [PATCH 08/88] Update linux.yml add self-hosted-Linux-X64 to options --- .github/workflows/linux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 08c59c9158..1264fb3141 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -38,6 +38,7 @@ on: type: choice options: - ubuntu-22.04 + - self-hosted-Linux-X64 jobs: linux-installer: From 8d961a58274b58215447c4c46db55df416bd32c4 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 17 May 2024 13:45:59 +0200 Subject: [PATCH 09/88] Update linux.yml --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 1264fb3141..b471881d3b 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -38,7 +38,7 @@ on: type: choice options: - ubuntu-22.04 - - self-hosted-Linux-X64 + - self-hosted-Ubuntu24-X64 jobs: linux-installer: From 5d7deeb94a0780a3e9e0aaa82aa337abc5d1d6f0 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 17 May 2024 14:03:56 +0200 Subject: [PATCH 10/88] change the default to self-hosted change the default to self-hosted --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index b471881d3b..a03be04768 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,7 +34,7 @@ on: operating_system: description: 'OS' required: true - default: 'ubuntu-22.04' + default: 'self-hosted-Ubuntu24-X64' type: choice options: - ubuntu-22.04 From 0912c62b34dd50a5de008c5e3bdd05628ed38368 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sat, 18 May 2024 18:51:32 +0200 Subject: [PATCH 11/88] use branch workflow rather than main for testing --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a03be04768..374348c0dc 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,7 @@ on: jobs: linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@HellAholic-patch-1 with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -50,4 +50,4 @@ jobs: staging: ${{ inputs.staging }} architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} - secrets: inherit \ No newline at end of file + secrets: inherit From 4eceea14029cc06c2f963b3592b231bb46290fa1 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 22 May 2024 14:48:10 +0200 Subject: [PATCH 12/88] Update linux.yml --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 374348c0dc..90f5463939 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -34,11 +34,11 @@ on: operating_system: description: 'OS' required: true - default: 'self-hosted-Ubuntu24-X64' + default: 'self-hosted-Ubuntu22-X64' type: choice options: - ubuntu-22.04 - - self-hosted-Ubuntu24-X64 + - self-hosted-Ubuntu22-X64 jobs: linux-installer: From b0bd3a2d1f267af77d6baec1cd1114255de68a0e Mon Sep 17 00:00:00 2001 From: HellAholic Date: Wed, 22 May 2024 15:36:15 +0200 Subject: [PATCH 13/88] Update linux.yml --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 90f5463939..f9d800c77d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,7 @@ on: jobs: linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@HellAholic-patch-1 + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} From 86ccddbb1d00eb121506095e21c46148aa688c33 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 17 May 2024 09:56:49 +0200 Subject: [PATCH 14/88] Change `value` to `resolve` CURA-11912 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 5a91188eee..f10ad98e4b 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6821,7 +6821,7 @@ "label": "Prime Tower Type", "description": "How to generate the prime tower:
  • Normal: create a bucket in which secondary materials are primed
  • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
", "type": "enum", - "value": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'", + "resolve": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'", "options": { "normal": "Normal", From 5af225ec2197b9a86608a1ae5df6d26b1c5647cc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 23 May 2024 14:45:56 +0200 Subject: [PATCH 15/88] Set version 5.7.2 --- conandata.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conandata.yml b/conandata.yml index 0edeed3306..84251d7208 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,9 +1,9 @@ -version: "5.7.1" +version: "5.7.2" requirements: - - "uranium/5.7.0" - - "curaengine/5.7.1" - - "cura_binary_data/5.7.1" - - "fdm_materials/5.7.1" + - "uranium/5.7.2" + - "curaengine/5.7.2" + - "cura_binary_data/5.7.2" + - "fdm_materials/5.7.2" - "curaengine_plugin_gradual_flow/0.1.0-beta.3" - "dulcificum/0.2.0-alpha.0" - "pysavitar/5.3.0" From a3d70e9429877700ad0d09b2593ad24b59292a29 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 27 May 2024 16:26:26 +0200 Subject: [PATCH 16/88] Allow setting interleaved prime tower base on material CURA-11931 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index f10ad98e4b..adfe2b05dd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6821,7 +6821,7 @@ "label": "Prime Tower Type", "description": "How to generate the prime tower:
  • Normal: create a bucket in which secondary materials are primed
  • Interleaved: create a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other
", "type": "enum", - "resolve": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'", + "resolve": "'interleaved' if all(mode == 'interleaved' for mode in extruderValues('prime_tower_mode')) else 'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'", "options": { "normal": "Normal", From e863eee1561ac8e8169d7a1c13455be2f06b5478 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 30 May 2024 09:18:08 +0200 Subject: [PATCH 17/88] Disable wait for temperature for UltiMaker printers Previously the material_print_temp_prepend and material_print_temp_wait were ignored for Griffin-flavored printers. Now we do handle them because we want the prepend, but we don't want the wait so disable it. --- resources/definitions/ultimaker.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 3821fdefd6..614f88242d 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -80,6 +80,7 @@ "maximum_value_warning": "120", "minimum_value": "0" }, + "material_print_temp_wait": { "value": false }, "material_print_temperature": { "minimum_value": "0" }, "material_standby_temperature": { From 219543dd4324ffd1ec012b1e58b3ac858814efb3 Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Thu, 30 May 2024 07:19:37 +0000 Subject: [PATCH 18/88] Applied printer-linter format --- resources/definitions/ultimaker.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 614f88242d..97bb099ea4 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -80,7 +80,7 @@ "maximum_value_warning": "120", "minimum_value": "0" }, - "material_print_temp_wait": { "value": false }, + "material_print_temp_wait": { "value": false }, "material_print_temperature": { "minimum_value": "0" }, "material_standby_temperature": { From 11f2be15f420d1aa67668291956bcbf06fe6e168 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 30 May 2024 09:54:47 +0200 Subject: [PATCH 19/88] Updated Changelog for Cura 5.7.2 --- resources/texts/change_log.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index 1883303896..4d3fce3a66 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,13 @@ +[5.7.2] + +* Bugfixes +- Fixed a bug where modifier meshes and support meshes were not loaded in the correct position, should resolve https://github.com/Ultimaker/Cura/issues/18761 (and https://github.com/5axes/SpoonAntiWarping/issues/8) +- Primeblobs were not printed for a second extruder +- Interleaved prime tower can now be printed with a raft +- Improved behaviors for start temperature for multiple extruders +- Improved preheating logic when using a raft with multiple extruders +- Enabled Raft Remove Inside Corners and Prime Tower Mode to be shipped with a material profile + [5.7.1] * Introducing the UltiMaker Factor 4 From a34a4420099ac343a42b49848f3016d65aafab57 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 31 May 2024 14:58:58 +0200 Subject: [PATCH 20/88] Add dedicated conandata.yml for cura_resources --- resources/conandata.yml | 1 + resources/conanfile.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 resources/conandata.yml diff --git a/resources/conandata.yml b/resources/conandata.yml new file mode 100644 index 0000000000..c2971e2769 --- /dev/null +++ b/resources/conandata.yml @@ -0,0 +1 @@ +version: "5.8.0-alpha.0" diff --git a/resources/conanfile.py b/resources/conanfile.py index b4cafc705e..fde648eeac 100644 --- a/resources/conanfile.py +++ b/resources/conanfile.py @@ -28,8 +28,6 @@ class CuraResource(ConanFile): self.version = self.conan_data["version"] def export(self): - copy(self, pattern="conandata.yml", src=os.path.join(self.recipe_folder, ".."), dst=self.export_folder, - keep_path=False) copy(self, pattern="LICENSE*", src=os.path.join(self.recipe_folder, ".."), dst=self.export_folder, keep_path=False) update_conandata(self, {"version": self.version}) From c6b66b369a0b5474066f0bf828f45a9f13c62480 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 31 May 2024 15:33:34 +0200 Subject: [PATCH 21/88] Make the installers worfklow callable --- .github/workflows/installers.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index f1bd4b2d19..5eef9e3a5d 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -30,6 +30,29 @@ on: required: true type: boolean + workflow_call: + inputs: + cura_conan_version: + default: 'cura/latest@ultimaker/testing' + required: true + type: string + conan_args: + default: '' + required: false + type: string + enterprise: + default: false + required: true + type: boolean + staging: + default: false + required: true + type: boolean + nightly: + default: false + required: true + type: boolean + schedule: # Daily at 4:15 CET (main-branch) and 5:15 CET (release-branch) - cron: '15 3 * * *' From f1c085932546fb129beab658ba4906ada0991e66 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 31 May 2024 16:39:34 +0200 Subject: [PATCH 22/88] Use workflow from branch (for testing) --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 09f972bb1a..1fcc05ecc4 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,7 +42,7 @@ on: jobs: windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-10769_automate_release_action with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} @@ -50,4 +50,4 @@ jobs: staging: ${{ inputs.staging }} architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} - secrets: inherit \ No newline at end of file + secrets: inherit From b2f1e80cb3d04901594238cd78b5655e5e493566 Mon Sep 17 00:00:00 2001 From: Max Heinekamp Date: Sat, 1 Jun 2024 20:47:52 +0200 Subject: [PATCH 23/88] Removed duplicate entry There were two entries defining "secondary_button_text". Kept the one near other secondary_button etires and set it to the "text_secondary_button" base color. --- resources/themes/cura-dark/theme.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 699b4537c3..1517b22eb9 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -56,7 +56,7 @@ "secondary_button": "background_1", "secondary_button_hover": "background_3", - "secondary_button_text": [255, 255, 255, 255], + "secondary_button_text": "text_secondary_button", "icon": "text_default", "toolbar_background": "background_1", @@ -69,9 +69,7 @@ "main_window_header_button_text_active": "background_4", "main_window_header_background": "background_4", "main_window_header_background_gradient": "background_4", - "main_window_header_button_background_hovered": [46, 46, 46, 255], - - "secondary_button_text": "text_secondary_button", + "main_window_header_button_background_hovered": [46, 46, 46, 255], "account_sync_state_icon": [255, 255, 255, 204], From f76deb71abcb5cee7441f9e814c159825f4a4de2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 3 Jun 2024 12:17:25 +0200 Subject: [PATCH 24/88] Use workflows from dev branch --- .github/workflows/installers.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 5eef9e3a5d..bd932b3346 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -65,7 +65,7 @@ env: jobs: default_values: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@CURA-10769_automate_release_action with: cura_conan_version: ${{ inputs.cura_conan_version }} latest_release: '5.6' @@ -73,7 +73,7 @@ jobs: latest_release_tag: 'nightly' windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-10769_automate_release_action needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -85,7 +85,7 @@ jobs: secrets: inherit linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-10769_automate_release_action needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -97,7 +97,7 @@ jobs: secrets: inherit macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10769_automate_release_action needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -109,7 +109,7 @@ jobs: secrets: inherit macos-arm-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10769_automate_release_action needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} From b71662f4dd31f97a978c40119b4800e4537b804c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 09:19:10 +0200 Subject: [PATCH 25/88] Add scripts for process automation --- .../release-process_feature-freeze.yml | 64 +++++++ .../release-process_release-candidate.yml | 172 ++++++++++++++++++ .github/workflows/release-process_tester.yml | 19 ++ scripts/extract_changelog.py | 34 ++++ 4 files changed, 289 insertions(+) create mode 100644 .github/workflows/release-process_feature-freeze.yml create mode 100644 .github/workflows/release-process_release-candidate.yml create mode 100644 .github/workflows/release-process_tester.yml create mode 100644 scripts/extract_changelog.py diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml new file mode 100644 index 0000000000..1c12b962e2 --- /dev/null +++ b/.github/workflows/release-process_feature-freeze.yml @@ -0,0 +1,64 @@ +name: Feature Freeze +run-name: Feature freeze Cura ${{ inputs.cura_version }} by @${{ github.actor }} + +on: + workflow_call: + inputs: + cura_version: + description: 'Cura version major and minor, e.g. 5.7' + required: true + type: string + +jobs: + parse-version: + name: Parse input version string + runs-on: ubuntu-latest + outputs: + package_version: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }}.0 + branch_name: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }} + steps: + - name: Parse version string + id: version_parser + uses: booxmedialtd/ws-action-parse-semver@v1.4.7 + with: + input_string: ${{ inputs.cura_version }} + + feature-freeze: + name: Process feature freeze + runs-on: ubuntu-latest + needs: [parse-version] + strategy: + matrix: + repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] + include: + - main_branch: main + - repository: Cura + main_branch: CURA-10769_automate_release_action + - repository: fdm_materials + main_branch: master + steps: + - name: Checkout repo + uses: actions/checkout@v4 + with: + repository: Ultimaker/${{ matrix.repository }} + ref: ${{ matrix.main_branch }} + token: ${{ secrets.CURA_AUTORELEASE_PAT }} + + - name: Update conan package version + run: | + PACKAGE_VERSION=${{ needs.parse-version.outputs.package_version }} + sed -i "s/version:.*/version: \"$PACKAGE_VERSION\"/g" conandata.yml + + - name: Update resources conan package version + if: ${{ matrix.repository == Cura }} + run: | + PACKAGE_VERSION=${{ needs.parse-version.outputs.package_version }} + sed -i "s/version:.*/version: \"$PACKAGE_VERSION\"/g" resources/conandata.yml + + - name: Create branch and commit + uses: stefanzweifel/git-auto-commit-action@v5.0.1 + with: + commit_message: Set conan package version ${{ needs.parse-version.outputs.package_version }} + file_pattern: conandata.yml + branch: ${{ needs.parse-version.outputs.branch_name }} + create_branch: true diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml new file mode 100644 index 0000000000..9fc99f659b --- /dev/null +++ b/.github/workflows/release-process_release-candidate.yml @@ -0,0 +1,172 @@ +name: Prepare Release Candidate +run-name: Release Candidate for Cura ${{ inputs.cura_version }} by @${{ github.actor }} + +on: + workflow_call: + inputs: + cura_version: + description: 'Cura version number, e.g. 5.7, 5.7.2 or 5.8.0-beta.2' + required: true + type: string + +jobs: + parse-version: + name: Parse input version string + runs-on: ubuntu-latest + outputs: + version_major: ${{ steps.version_parser.outputs.major }} + version_minor: ${{ steps.version_parser.outputs.minor }} + version_patch: ${{ steps.version_parser.outputs.patch }} + branch_name: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }} + steps: + - name: Parse version string + id: version_parser + uses: booxmedialtd/ws-action-parse-semver@v1.4.7 + with: + input_string: ${{ inputs.cura_version }} + + prepare-cura-repo: + name: Update dependencies and find RC tag name + runs-on: ubuntu-latest + needs: [parse-version] + outputs: + tag_name: ${{ steps.find-available-tag-name.outputs.tag_name }} + steps: + - name: Checkout repo + uses: actions/checkout@v4 + with: + ref: ${{ needs.parse-version.outputs.branch_name }} + fetch-tags: true + fetch-depth: 0 + + - name: Update Cura dependencies + run: | + PACKAGE_VERSION=${{ inputs.cura_version }} + sed -i "s/\"uranium\/.*/\"uranium\/$PACKAGE_VERSION\"/g" conandata.yml + sed -i "s/\"cura_resources\/.*/\"cura_resources\/$PACKAGE_VERSION\"/g" conandata.yml + sed -i "s/\"curaengine\/.*/\"curaengine\/$PACKAGE_VERSION\"/g" conandata.yml + sed -i "s/\"cura_binary_data\/.*/\"cura_binary_data\/$PACKAGE_VERSION\"/g" conandata.yml + sed -i "s/\"fdm_materials\/.*/\"fdm_materials\/$PACKAGE_VERSION\"/g" conandata.yml + + - name: Commit new dependencies versioning + uses: stefanzweifel/git-auto-commit-action@v5.0.1 + with: + commit_message: Set dependencies version ${{ inputs.cura_version }} + file_pattern: conandata.yml + + - name: Find available tag name + id: find-available-tag-name + run: | + VERSION=${{ inputs.cura_version }} + + RC_INDEX=0 + while + RC_INDEX=$((RC_INDEX+1)) + TAG_NAME="$VERSION-RC$RC_INDEX" + [[ $(git tag -l "$TAG_NAME") ]] + do true; done + + echo "tag_name=$TAG_NAME" >> "$GITHUB_OUTPUT" + + create-tags: + name: Create tags + runs-on: ubuntu-latest + needs: [parse-version, prepare-cura-repo] + strategy: + matrix: + repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] + steps: + - name: Checkout repo + uses: actions/checkout@v4 + with: + repository: Ultimaker/${{ matrix.repository }} + ref: ${{ needs.parse-version.outputs.branch_name }} + token: ${{ secrets.CURA_AUTORELEASE_PAT }} + + - name: Create tag + run: | + git tag ${{ needs.prepare-cura-repo.outputs.tag_name }} + git push origin tag ${{ needs.prepare-cura-repo.outputs.tag_name }} + + create-dependencies-packages: + name: Create conan packages for dependencies + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action + needs: [parse-version, prepare-cura-repo] + strategy: + matrix: + repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] + include: + - conan_recipe_root: "." + - repository: Cura + conan_recipe_root: "resources" + with: + repository: ${{ matrix.repository }} + ref_name: ${{ needs.parse-version.outputs.branch_name }} + version: ${{ inputs.cura_version }} + conan_release: true + conan_user_channel: ultimaker/stable + conan_internal: false + conan_latest: true + conan_recipe_root: ${{ matrix.conan_recipe_root }} + secrets: inherit + + create-cura-package: + name: Create conan package for Cura + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action + needs: [parse-version, create-dependencies-packages] + with: + repository: Cura + ref_name: ${{ needs.parse-version.outputs.branch_name }} + version: ${{ inputs.cura_version }} + conan_release: true + conan_user_channel: ultimaker/stable + conan_internal: false + conan_latest: true + secrets: inherit + + create-installers: + name: Create installers + uses: ./.github/workflows/installers.yml@CURA-10769_automate_release_action + needs: [parse-version, create-cura-package] + with: + cura_conan_version: cura/${{ inputs.cura_version }}@/ + enterprise: false + staging: false + nightly: false + secrets: inherit + + create-release-draft: + name: Create the release draft + runs-on: ubuntu-latest + needs: [create-installers, parse-version] + steps: + - name: Download artifacts + uses: actions/download-artifact@v4.1.7 + with: + path: artifacts + merge-multiple: true + + - name: Checkout Cura repo + uses: actions/checkout@v4 + with: + ref: ${{ needs.parse-version.outputs.branch_name }} + + - name: Extract changelog + run: python ./scripts/extract_changelog.py --version ${{ needs.parse-version.outputs.version_major }}.${{ needs.parse-version.outputs.version_minor }}.${{ needs.parse-version.outputs.version_patch }} --changelog ./resources/texts/change_log.txt > formatted_changelog.txt + + - name: Get commit id for release + id: get-commit-id + uses: iawia002/get-tag-or-commit-id@v1.0.1 + with: + length: 40 + + - name: Create release + uses: notpeelz/action-gh-create-release@v5.0.1 + with: + target: ${{ steps.get-commit-id.outputs.id }} + tag: ${{ inputs.cura_version }} + strategy: replace + title: UltiMaker Cura ${{ inputs.cura_version }} + draft: true + body-source: file + body: formatted_changelog.txt diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml new file mode 100644 index 0000000000..18f11f3565 --- /dev/null +++ b/.github/workflows/release-process_tester.yml @@ -0,0 +1,19 @@ +name: Test release actions +run-name: Test + +on: + push + +jobs: + test-feature-freeze: + uses: ultimaker/cura-workflows/.github/workflows/release-process_feature-freeze.yml@CURA-10769_automate_release_action + with: + cura_version: 255.124 + secrets: inherit + + test-release-candidate: + uses: ultimaker/cura-workflows/.github/workflows/release-process_release-candidate.yml@CURA-10769_automate_release_action + needs: [test-feature-freeze] + with: + cura_version: 255.124.0-beta.1 + secrets: inherit diff --git a/scripts/extract_changelog.py b/scripts/extract_changelog.py new file mode 100644 index 0000000000..0ee20f9ccc --- /dev/null +++ b/scripts/extract_changelog.py @@ -0,0 +1,34 @@ +import argparse +import re + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description = 'Extract the changelog to be inserted to the release description') + parser.add_argument('--changelog', type = str, help = 'Path to the changelog file', required = True) + parser.add_argument('--version', type = str, help = 'Cura version to be extracted', required = True) + args = parser.parse_args() + + start_token = f"[{args.version}]" + pattern_stop_log = "\[\d+(\.\d+){1,2}\]" + log_line = False + first_chapter = True + + with open(args.changelog, "r") as changelog_file: + for line in changelog_file.readlines(): + line = line.strip() + + if log_line: + if re.match(pattern_stop_log, line): + log_line = False + elif len(line) > 0: + if line.startswith('*'): + if not first_chapter: + print("") + first_chapter = False + + line = line[1:].strip() + print(f"

{line}

\n") + else: + print(line) + elif line == start_token: + log_line = True From 7e6a03caf77b8337bd778d88a296543062584b6e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 09:21:42 +0200 Subject: [PATCH 26/88] Use the proper path to call workflows --- .github/workflows/release-process_tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 18f11f3565..5e2d0e6d99 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -6,13 +6,13 @@ on: jobs: test-feature-freeze: - uses: ultimaker/cura-workflows/.github/workflows/release-process_feature-freeze.yml@CURA-10769_automate_release_action + uses: ./.github/workflows/release-process_feature-freeze.yml@CURA-10769_automate_release_action with: cura_version: 255.124 secrets: inherit test-release-candidate: - uses: ultimaker/cura-workflows/.github/workflows/release-process_release-candidate.yml@CURA-10769_automate_release_action + uses: ./.github/workflows/release-process_release-candidate.yml@CURA-10769_automate_release_action needs: [test-feature-freeze] with: cura_version: 255.124.0-beta.1 From b12520b8fdec2ef68b365e62f49bffe4e8cb23e5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 09:23:38 +0200 Subject: [PATCH 27/88] Remove version for direct script call --- .github/workflows/release-process_tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 5e2d0e6d99..8220d61d31 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -6,13 +6,13 @@ on: jobs: test-feature-freeze: - uses: ./.github/workflows/release-process_feature-freeze.yml@CURA-10769_automate_release_action + uses: ./.github/workflows/release-process_feature-freeze.yml with: cura_version: 255.124 secrets: inherit test-release-candidate: - uses: ./.github/workflows/release-process_release-candidate.yml@CURA-10769_automate_release_action + uses: ./.github/workflows/release-process_release-candidate.yml needs: [test-feature-freeze] with: cura_version: 255.124.0-beta.1 From 3808a566004df365801706abd2d7265639eb9c31 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 09:24:55 +0200 Subject: [PATCH 28/88] Fix indendation --- .github/workflows/release-process_release-candidate.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 9fc99f659b..3e6b520826 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -142,9 +142,9 @@ jobs: steps: - name: Download artifacts uses: actions/download-artifact@v4.1.7 - with: - path: artifacts - merge-multiple: true + with: + path: artifacts + merge-multiple: true - name: Checkout Cura repo uses: actions/checkout@v4 From 1133bc13b009e1c0df4ccd273291e34326a7f1aa Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 09:27:20 +0200 Subject: [PATCH 29/88] Remove version for direct script call --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 3e6b520826..875f9b26e8 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -126,7 +126,7 @@ jobs: create-installers: name: Create installers - uses: ./.github/workflows/installers.yml@CURA-10769_automate_release_action + uses: ./.github/workflows/installers.yml needs: [parse-version, create-cura-package] with: cura_conan_version: cura/${{ inputs.cura_version }}@/ From 05abc7fafb78fcf2a02805a79a8b9500bd963593 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 09:29:17 +0200 Subject: [PATCH 30/88] Use proper string syntax --- .github/workflows/release-process_feature-freeze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index 1c12b962e2..c57ab4c23c 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -50,7 +50,7 @@ jobs: sed -i "s/version:.*/version: \"$PACKAGE_VERSION\"/g" conandata.yml - name: Update resources conan package version - if: ${{ matrix.repository == Cura }} + if: ${{ matrix.repository == 'Cura' }} run: | PACKAGE_VERSION=${{ needs.parse-version.outputs.package_version }} sed -i "s/version:.*/version: \"$PACKAGE_VERSION\"/g" resources/conandata.yml From 4a1c9de31228820956c9fa178888c4d32bb9ed3f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 09:50:02 +0200 Subject: [PATCH 31/88] Allow entering a short version number --- .github/workflows/release-process_feature-freeze.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index c57ab4c23c..a376b6fcf5 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -21,7 +21,7 @@ jobs: id: version_parser uses: booxmedialtd/ws-action-parse-semver@v1.4.7 with: - input_string: ${{ inputs.cura_version }} + input_string: ${{ inputs.cura_version }}.0 feature-freeze: name: Process feature freeze From 30dc16e6878145f6f3fd5fc5bd75a7600ec1a092 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 11:55:57 +0200 Subject: [PATCH 32/88] Give specific token to package creation action --- .github/workflows/release-process_release-candidate.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 875f9b26e8..d5e067d7de 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -108,7 +108,8 @@ jobs: conan_internal: false conan_latest: true conan_recipe_root: ${{ matrix.conan_recipe_root }} - secrets: inherit + secrets: + token: ${{ secrets.CURA_AUTORELEASE_PAT }} create-cura-package: name: Create conan package for Cura From 9a94272374d23567f49d0c53c979163bc39ac165 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 12:04:11 +0200 Subject: [PATCH 33/88] Give PAT directly into secrets --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index d5e067d7de..14e387c862 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -109,7 +109,7 @@ jobs: conan_latest: true conan_recipe_root: ${{ matrix.conan_recipe_root }} secrets: - token: ${{ secrets.CURA_AUTORELEASE_PAT }} + CURA_CONAN_PACKAGE_RELEASE_PAT: ${{ secrets.CURA_AUTORELEASE_PAT }} create-cura-package: name: Create conan package for Cura From 94b4bbb87f1914f4f3e6541e719dcad6aee8eb52 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 13:02:08 +0200 Subject: [PATCH 34/88] Give access token as regular input --- .github/workflows/release-process_release-candidate.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 14e387c862..b11e305cc8 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -108,8 +108,7 @@ jobs: conan_internal: false conan_latest: true conan_recipe_root: ${{ matrix.conan_recipe_root }} - secrets: - CURA_CONAN_PACKAGE_RELEASE_PAT: ${{ secrets.CURA_AUTORELEASE_PAT }} + token: ${{ secrets.CURA_AUTORELEASE_PAT }} create-cura-package: name: Create conan package for Cura From b45cb03c081d51c3e7118e548f4fc755f233dbd1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 13:25:22 +0200 Subject: [PATCH 35/88] Call package release remotely --- .../release-process_release-candidate.yml | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index b11e305cc8..41a1e78667 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -90,7 +90,7 @@ jobs: create-dependencies-packages: name: Create conan packages for dependencies - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action + uses: mathze/workflow-dispatch-action@v1.3.0 needs: [parse-version, prepare-cura-repo] strategy: matrix: @@ -100,15 +100,22 @@ jobs: - repository: Cura conan_recipe_root: "resources" with: - repository: ${{ matrix.repository }} - ref_name: ${{ needs.parse-version.outputs.branch_name }} - version: ${{ inputs.cura_version }} - conan_release: true - conan_user_channel: ultimaker/stable - conan_internal: false - conan_latest: true - conan_recipe_root: ${{ matrix.conan_recipe_root }} - token: ${{ secrets.CURA_AUTORELEASE_PAT }} + owner: Ultimaker + repo: Cura-workflows + workflow-name: conan-package-release.yml + ref: CURA-10769_automate_release_action + payload: | + { + "repository": "${{ matrix.repository }}" + "ref_name": "${{ needs.parse-version.outputs.branch_name }}" + "version": "${{ inputs.cura_version }}" + "conan_release": true + "conan_user_channel": "ultimaker/stable" + "conan_internal": false + "conan_latest": true + "conan_recipe_root": "${{ matrix.conan_recipe_root }}" + + } create-cura-package: name: Create conan package for Cura From 26c450d56c6581208eef69fd38d4e4124fe0dd0b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 13:31:33 +0200 Subject: [PATCH 36/88] Set proper token, and wait --- .github/workflows/release-process_release-candidate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 41a1e78667..6419c63e2d 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -103,7 +103,9 @@ jobs: owner: Ultimaker repo: Cura-workflows workflow-name: conan-package-release.yml + use-marker-step: true ref: CURA-10769_automate_release_action + token: ${{ secrets.CURA_AUTORELEASE_PAT }} payload: | { "repository": "${{ matrix.repository }}" From 3a18950c20e5489ee66f72b4f797f920d0660331 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 13:43:43 +0200 Subject: [PATCH 37/88] Fix syntax --- .../release-process_release-candidate.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 6419c63e2d..6765d49abd 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -108,15 +108,14 @@ jobs: token: ${{ secrets.CURA_AUTORELEASE_PAT }} payload: | { - "repository": "${{ matrix.repository }}" - "ref_name": "${{ needs.parse-version.outputs.branch_name }}" - "version": "${{ inputs.cura_version }}" - "conan_release": true - "conan_user_channel": "ultimaker/stable" - "conan_internal": false - "conan_latest": true + "repository": "${{ matrix.repository }}", + "ref_name": "${{ needs.parse-version.outputs.branch_name }}", + "version": "${{ inputs.cura_version }}", + "conan_release": true, + "conan_user_channel": "ultimaker/stable", + "conan_internal": false, + "conan_latest": true, "conan_recipe_root": "${{ matrix.conan_recipe_root }}" - } create-cura-package: From e94caa2e3a08fa1156f4c643ce5b2f6a6a1154a8 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 13:52:12 +0200 Subject: [PATCH 38/88] Call actions with absolute path --- .github/workflows/release-process_release-candidate.yml | 2 +- .github/workflows/release-process_tester.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 6765d49abd..918feb979e 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -134,7 +134,7 @@ jobs: create-installers: name: Create installers - uses: ./.github/workflows/installers.yml + uses: UltiMaker/Cura/.github/workflows/installers.yml@CURA-10769_automate_release_action needs: [parse-version, create-cura-package] with: cura_conan_version: cura/${{ inputs.cura_version }}@/ diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 8220d61d31..15f041f52a 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -6,13 +6,13 @@ on: jobs: test-feature-freeze: - uses: ./.github/workflows/release-process_feature-freeze.yml + uses: Ultimaker/Cura/.github/workflows/release-process_feature-freeze.yml@CURA-10769_automate_release_action with: cura_version: 255.124 secrets: inherit test-release-candidate: - uses: ./.github/workflows/release-process_release-candidate.yml + uses: Ultimaker/Cura/.github/workflows/release-process_release-candidate.yml@CURA-10769_automate_release_action needs: [test-feature-freeze] with: cura_version: 255.124.0-beta.1 From c398314175310efe94a8f547817de124cc0fedbc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 13:55:43 +0200 Subject: [PATCH 39/88] Attempt to fix the syntax --- .github/workflows/release-process_release-candidate.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 918feb979e..e2febdbaf9 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -120,7 +120,7 @@ jobs: create-cura-package: name: Create conan package for Cura - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action + uses: Ultimaker/Cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action needs: [parse-version, create-dependencies-packages] with: repository: Cura @@ -134,7 +134,7 @@ jobs: create-installers: name: Create installers - uses: UltiMaker/Cura/.github/workflows/installers.yml@CURA-10769_automate_release_action + uses: Ultimaker/Cura/.github/workflows/installers.yml@CURA-10769_automate_release_action needs: [parse-version, create-cura-package] with: cura_conan_version: cura/${{ inputs.cura_version }}@/ From 72cc8d5b579271caf4640d8cafbbf2b0a2be30c6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 13:56:44 +0200 Subject: [PATCH 40/88] Remove part of possibly faulty code --- .../release-process_release-candidate.yml | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index e2febdbaf9..87e08853f3 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -88,35 +88,35 @@ jobs: git tag ${{ needs.prepare-cura-repo.outputs.tag_name }} git push origin tag ${{ needs.prepare-cura-repo.outputs.tag_name }} - create-dependencies-packages: - name: Create conan packages for dependencies - uses: mathze/workflow-dispatch-action@v1.3.0 - needs: [parse-version, prepare-cura-repo] - strategy: - matrix: - repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] - include: - - conan_recipe_root: "." - - repository: Cura - conan_recipe_root: "resources" - with: - owner: Ultimaker - repo: Cura-workflows - workflow-name: conan-package-release.yml - use-marker-step: true - ref: CURA-10769_automate_release_action - token: ${{ secrets.CURA_AUTORELEASE_PAT }} - payload: | - { - "repository": "${{ matrix.repository }}", - "ref_name": "${{ needs.parse-version.outputs.branch_name }}", - "version": "${{ inputs.cura_version }}", - "conan_release": true, - "conan_user_channel": "ultimaker/stable", - "conan_internal": false, - "conan_latest": true, - "conan_recipe_root": "${{ matrix.conan_recipe_root }}" - } + #create-dependencies-packages: + #name: Create conan packages for dependencies + #uses: mathze/workflow-dispatch-action@v1.3.0 + #needs: [parse-version, prepare-cura-repo] + #strategy: + #matrix: + #repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] + #include: + #- conan_recipe_root: "." + #- repository: Cura + #conan_recipe_root: "resources" + #with: + #owner: Ultimaker + #repo: Cura-workflows + #workflow-name: conan-package-release.yml + #use-marker-step: true + #ref: CURA-10769_automate_release_action + #token: ${{ secrets.CURA_AUTORELEASE_PAT }} + #payload: | + #{ + #"repository": "${{ matrix.repository }}", + #"ref_name": "${{ needs.parse-version.outputs.branch_name }}", + #"version": "${{ inputs.cura_version }}", + #"conan_release": true, + #"conan_user_channel": "ultimaker/stable", + #"conan_internal": false, + #"conan_latest": true, + #"conan_recipe_root": "${{ matrix.conan_recipe_root }}" + #} create-cura-package: name: Create conan package for Cura From 1972ca2f6c0f86b456773206ad58eca0d823802d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 13:57:46 +0200 Subject: [PATCH 41/88] Restore part of the call --- .github/workflows/release-process_release-candidate.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 87e08853f3..4224af0cf3 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -88,10 +88,11 @@ jobs: git tag ${{ needs.prepare-cura-repo.outputs.tag_name }} git push origin tag ${{ needs.prepare-cura-repo.outputs.tag_name }} - #create-dependencies-packages: - #name: Create conan packages for dependencies + create-dependencies-packages: + name: Create conan packages for dependencies #uses: mathze/workflow-dispatch-action@v1.3.0 - #needs: [parse-version, prepare-cura-repo] + needs: [parse-version, prepare-cura-repo] + run: echo coucou #strategy: #matrix: #repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] From 7c435a1bd5f7007731963ebd712cd91329b07be4 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:01:13 +0200 Subject: [PATCH 42/88] Call dispatch in a step --- .../release-process_release-candidate.yml | 57 ++++++++++--------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 4224af0cf3..3d05ac6d8a 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -90,34 +90,37 @@ jobs: create-dependencies-packages: name: Create conan packages for dependencies - #uses: mathze/workflow-dispatch-action@v1.3.0 + runs-on: ubuntu-latest needs: [parse-version, prepare-cura-repo] - run: echo coucou - #strategy: - #matrix: - #repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] - #include: - #- conan_recipe_root: "." - #- repository: Cura - #conan_recipe_root: "resources" - #with: - #owner: Ultimaker - #repo: Cura-workflows - #workflow-name: conan-package-release.yml - #use-marker-step: true - #ref: CURA-10769_automate_release_action - #token: ${{ secrets.CURA_AUTORELEASE_PAT }} - #payload: | - #{ - #"repository": "${{ matrix.repository }}", - #"ref_name": "${{ needs.parse-version.outputs.branch_name }}", - #"version": "${{ inputs.cura_version }}", - #"conan_release": true, - #"conan_user_channel": "ultimaker/stable", - #"conan_internal": false, - #"conan_latest": true, - #"conan_recipe_root": "${{ matrix.conan_recipe_root }}" - #} + strategy: + matrix: + repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] + include: + - conan_recipe_root: "." + - repository: Cura + conan_recipe_root: "resources" + steps: + call-create-package: + name: Call external create package + uses: mathze/workflow-dispatch-action@v1.3.0 + with: + owner: Ultimaker + repo: Cura-workflows + workflow-name: conan-package-release.yml + use-marker-step: true + ref: CURA-10769_automate_release_action + token: ${{ secrets.CURA_AUTORELEASE_PAT }} + payload: | + { + "repository": "${{ matrix.repository }}", + "ref_name": "${{ needs.parse-version.outputs.branch_name }}", + "version": "${{ inputs.cura_version }}", + "conan_release": true, + "conan_user_channel": "ultimaker/stable", + "conan_internal": false, + "conan_latest": true, + "conan_recipe_root": "${{ matrix.conan_recipe_root }}" + } create-cura-package: name: Create conan package for Cura From 9ad5a3f93df7ac90d494819a16863426d55c9a1f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:03:06 +0200 Subject: [PATCH 43/88] Fix step syntax --- .github/workflows/release-process_release-candidate.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 3d05ac6d8a..4d7d30f4e9 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -100,8 +100,7 @@ jobs: - repository: Cura conan_recipe_root: "resources" steps: - call-create-package: - name: Call external create package + - name: Call external create package uses: mathze/workflow-dispatch-action@v1.3.0 with: owner: Ultimaker From 4e569986d283939969015d8c031d478de5697fde Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:04:16 +0200 Subject: [PATCH 44/88] Use compact syntax to call local scripts --- .github/workflows/release-process_release-candidate.yml | 2 +- .github/workflows/release-process_tester.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 4d7d30f4e9..f144338168 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -137,7 +137,7 @@ jobs: create-installers: name: Create installers - uses: Ultimaker/Cura/.github/workflows/installers.yml@CURA-10769_automate_release_action + uses: ./.github/workflows/installers.yml needs: [parse-version, create-cura-package] with: cura_conan_version: cura/${{ inputs.cura_version }}@/ diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 15f041f52a..8220d61d31 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -6,13 +6,13 @@ on: jobs: test-feature-freeze: - uses: Ultimaker/Cura/.github/workflows/release-process_feature-freeze.yml@CURA-10769_automate_release_action + uses: ./.github/workflows/release-process_feature-freeze.yml with: cura_version: 255.124 secrets: inherit test-release-candidate: - uses: Ultimaker/Cura/.github/workflows/release-process_release-candidate.yml@CURA-10769_automate_release_action + uses: ./.github/workflows/release-process_release-candidate.yml needs: [test-feature-freeze] with: cura_version: 255.124.0-beta.1 From c02c3500c6d29ae81f242ec9ca0fc1b592cc7c7a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:15:40 +0200 Subject: [PATCH 45/88] Fix changelog extraction for minor releases --- scripts/extract_changelog.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/extract_changelog.py b/scripts/extract_changelog.py index 0ee20f9ccc..a1a0b251f0 100644 --- a/scripts/extract_changelog.py +++ b/scripts/extract_changelog.py @@ -8,6 +8,10 @@ if __name__ == "__main__": parser.add_argument('--version', type = str, help = 'Cura version to be extracted', required = True) args = parser.parse_args() + # In the changelog we usually omit the patch number for minor release (i.e. 5.7.0 => 5.7) + if args.version.endswith('.0'): + args.version = args.version[:-2] + start_token = f"[{args.version}]" pattern_stop_log = "\[\d+(\.\d+){1,2}\]" log_line = False From ec56098a9ee89ad49837119c30d1f82ef69171ac Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:34:13 +0200 Subject: [PATCH 46/88] Create Cura package remotely --- .../release-process_release-candidate.yml | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index f144338168..8b201cd9af 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -122,18 +122,29 @@ jobs: } create-cura-package: - name: Create conan package for Cura - uses: Ultimaker/Cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action + name: Create conan packages for Cura + runs-on: ubuntu-latest needs: [parse-version, create-dependencies-packages] - with: - repository: Cura - ref_name: ${{ needs.parse-version.outputs.branch_name }} - version: ${{ inputs.cura_version }} - conan_release: true - conan_user_channel: ultimaker/stable - conan_internal: false - conan_latest: true - secrets: inherit + steps: + - name: Call external create package + uses: mathze/workflow-dispatch-action@v1.3.0 + with: + owner: Ultimaker + repo: Cura-workflows + workflow-name: conan-package-release.yml + use-marker-step: true + ref: CURA-10769_automate_release_action + token: ${{ secrets.CURA_AUTORELEASE_PAT }} + payload: | + { + "repository": "Cura", + "ref_name": "${{ needs.parse-version.outputs.branch_name }}", + "version": "${{ inputs.cura_version }}", + "conan_release": true, + "conan_user_channel": "ultimaker/stable", + "conan_internal": false, + "conan_latest": true + } create-installers: name: Create installers From 713242782814daa3fd23cde0a31acc35e73d4f00 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:34:24 +0200 Subject: [PATCH 47/88] Skip feature freeze --- .github/workflows/release-process_tester.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 8220d61d31..09ebe920d1 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -5,15 +5,15 @@ on: push jobs: - test-feature-freeze: - uses: ./.github/workflows/release-process_feature-freeze.yml - with: - cura_version: 255.124 - secrets: inherit + #test-feature-freeze: + #uses: ./.github/workflows/release-process_feature-freeze.yml + #with: + #cura_version: 255.124 + #secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml - needs: [test-feature-freeze] + #needs: [test-feature-freeze] with: cura_version: 255.124.0-beta.1 secrets: inherit From ce30f1734949634623d4e746bc72797a3f62731a Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:43:53 +0200 Subject: [PATCH 48/88] Fine-tune workflow call settings --- .github/workflows/release-process_release-candidate.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 8b201cd9af..d66a709cb4 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -106,9 +106,10 @@ jobs: owner: Ultimaker repo: Cura-workflows workflow-name: conan-package-release.yml - use-marker-step: true ref: CURA-10769_automate_release_action token: ${{ secrets.CURA_AUTORELEASE_PAT }} + fail-on-error: true + wait-timeout: 60m payload: | { "repository": "${{ matrix.repository }}", @@ -132,9 +133,10 @@ jobs: owner: Ultimaker repo: Cura-workflows workflow-name: conan-package-release.yml - use-marker-step: true ref: CURA-10769_automate_release_action token: ${{ secrets.CURA_AUTORELEASE_PAT }} + fail-on-error: true + wait-timeout: 60m payload: | { "repository": "Cura", From f72a4a253a22f1f361f9f8e8753b9d1f3d4eb3a0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:46:56 +0200 Subject: [PATCH 49/88] Fix Cura-binary-data package creation call syntax --- .github/workflows/release-process_release-candidate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index d66a709cb4..6db788ef0a 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -94,7 +94,7 @@ jobs: needs: [parse-version, prepare-cura-repo] strategy: matrix: - repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] + repository: [Cura, Uranium, CuraEngine, Cura-binary-data, fdm_materials] include: - conan_recipe_root: "." - repository: Cura From c4643472e674d0a12b7bc496b3616395ca6e65a0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 14:52:21 +0200 Subject: [PATCH 50/88] Activate wait on remote action call --- .github/workflows/release-process_release-candidate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 6db788ef0a..c0fe62cc84 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -110,6 +110,7 @@ jobs: token: ${{ secrets.CURA_AUTORELEASE_PAT }} fail-on-error: true wait-timeout: 60m + run-id: dummy-run-id payload: | { "repository": "${{ matrix.repository }}", @@ -137,6 +138,7 @@ jobs: token: ${{ secrets.CURA_AUTORELEASE_PAT }} fail-on-error: true wait-timeout: 60m + run-id: dummy-run-id payload: | { "repository": "Cura", From 2ca76f5e9cec94e47ba6bdb21362054bba09ee95 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 5 Jun 2024 16:34:11 +0200 Subject: [PATCH 51/88] Attempt to fix wrong given inputs --- .../workflows/release-process_release-candidate.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index c0fe62cc84..2f042844c8 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -116,10 +116,10 @@ jobs: "repository": "${{ matrix.repository }}", "ref_name": "${{ needs.parse-version.outputs.branch_name }}", "version": "${{ inputs.cura_version }}", - "conan_release": true, + "conan_release": "true", "conan_user_channel": "ultimaker/stable", - "conan_internal": false, - "conan_latest": true, + "conan_internal": "false", + "conan_latest": "true", "conan_recipe_root": "${{ matrix.conan_recipe_root }}" } @@ -144,10 +144,10 @@ jobs: "repository": "Cura", "ref_name": "${{ needs.parse-version.outputs.branch_name }}", "version": "${{ inputs.cura_version }}", - "conan_release": true, + "conan_release": "true", "conan_user_channel": "ultimaker/stable", - "conan_internal": false, - "conan_latest": true + "conan_internal": "false", + "conan_latest": "true" } create-installers: From d3e5dc387049cbee7e7a9081f002d2cba50d00ba Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 07:33:50 +0200 Subject: [PATCH 52/88] Add downloaded artifacts to release --- .github/workflows/release-process_release-candidate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 2f042844c8..55169a6d56 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -196,3 +196,4 @@ jobs: draft: true body-source: file body: formatted_changelog.txt + files: artifacts/UltiMaker-Cura-* From d3e10aff832cbff8437f784e5bb59b8f0cf76fc5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 09:06:53 +0200 Subject: [PATCH 53/88] Use different action to dispatch package creation --- .../release-process_release-candidate.yml | 45 ++++++++++++------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 55169a6d56..9ac52b0b53 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -101,17 +101,15 @@ jobs: conan_recipe_root: "resources" steps: - name: Call external create package - uses: mathze/workflow-dispatch-action@v1.3.0 + id: dispatch-create-action + uses: Codex-/return-dispatch@v1.14.0 with: owner: Ultimaker repo: Cura-workflows - workflow-name: conan-package-release.yml - ref: CURA-10769_automate_release_action token: ${{ secrets.CURA_AUTORELEASE_PAT }} - fail-on-error: true - wait-timeout: 60m - run-id: dummy-run-id - payload: | + workflow: conan-package-release.yml + ref: CURA-10769_automate_release_action + workflow_inputs: | { "repository": "${{ matrix.repository }}", "ref_name": "${{ needs.parse-version.outputs.branch_name }}", @@ -123,23 +121,30 @@ jobs: "conan_recipe_root": "${{ matrix.conan_recipe_root }}" } + - name: Wait for package creation completion + uses: Codex-/await-remote-run@v1.12.2 + with: + owner: Ultimaker + repo: Cura-workflows + token: ${{ secrets.CURA_AUTORELEASE_PAT }} + run_id: ${{ steps.dispatch-create-action.outputs.run_id }} + run_timeout_seconds: 1800 + create-cura-package: name: Create conan packages for Cura runs-on: ubuntu-latest needs: [parse-version, create-dependencies-packages] steps: - name: Call external create package - uses: mathze/workflow-dispatch-action@v1.3.0 + id: dispatch-create-action + uses: Codex-/return-dispatch@v1.14.0 with: owner: Ultimaker repo: Cura-workflows - workflow-name: conan-package-release.yml - ref: CURA-10769_automate_release_action token: ${{ secrets.CURA_AUTORELEASE_PAT }} - fail-on-error: true - wait-timeout: 60m - run-id: dummy-run-id - payload: | + workflow: conan-package-release.yml + ref: CURA-10769_automate_release_action + workflow_inputs: | { "repository": "Cura", "ref_name": "${{ needs.parse-version.outputs.branch_name }}", @@ -147,9 +152,19 @@ jobs: "conan_release": "true", "conan_user_channel": "ultimaker/stable", "conan_internal": "false", - "conan_latest": "true" + "conan_latest": "true", + "conan_recipe_root": "${{ matrix.conan_recipe_root }}" } + - name: Wait for package creation completion + uses: Codex-/await-remote-run@v1.12.2 + with: + owner: Ultimaker + repo: Cura-workflows + token: ${{ secrets.CURA_AUTORELEASE_PAT }} + run_id: ${{ steps.dispatch-create-action.outputs.run_id }} + run_timeout_seconds: 3600 + create-installers: name: Create installers uses: ./.github/workflows/installers.yml From f351dd2aba9e0b6f8f21dc6c887de8232ed20bdc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 09:22:04 +0200 Subject: [PATCH 54/88] Call create package workflow directly --- .../release-process_release-candidate.yml | 87 +++++-------------- 1 file changed, 23 insertions(+), 64 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 9ac52b0b53..0a8bc23415 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -90,80 +90,39 @@ jobs: create-dependencies-packages: name: Create conan packages for dependencies - runs-on: ubuntu-latest + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action needs: [parse-version, prepare-cura-repo] strategy: matrix: - repository: [Cura, Uranium, CuraEngine, Cura-binary-data, fdm_materials] + repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] include: - conan_recipe_root: "." - repository: Cura conan_recipe_root: "resources" - steps: - - name: Call external create package - id: dispatch-create-action - uses: Codex-/return-dispatch@v1.14.0 - with: - owner: Ultimaker - repo: Cura-workflows - token: ${{ secrets.CURA_AUTORELEASE_PAT }} - workflow: conan-package-release.yml - ref: CURA-10769_automate_release_action - workflow_inputs: | - { - "repository": "${{ matrix.repository }}", - "ref_name": "${{ needs.parse-version.outputs.branch_name }}", - "version": "${{ inputs.cura_version }}", - "conan_release": "true", - "conan_user_channel": "ultimaker/stable", - "conan_internal": "false", - "conan_latest": "true", - "conan_recipe_root": "${{ matrix.conan_recipe_root }}" - } - - - name: Wait for package creation completion - uses: Codex-/await-remote-run@v1.12.2 - with: - owner: Ultimaker - repo: Cura-workflows - token: ${{ secrets.CURA_AUTORELEASE_PAT }} - run_id: ${{ steps.dispatch-create-action.outputs.run_id }} - run_timeout_seconds: 1800 + with: + repository: ${{ matrix.repository }} + ref_name: ${{ needs.parse-version.outputs.branch_name }} + version: ${{ inputs.cura_version }} + conan_release: true + conan_user_channel: ultimaker/stable + conan_internal: false + conan_latest: true + conan_recipe_root: ${{ matrix.conan_recipe_root }} + token: ${{ secrets.CURA_AUTORELEASE_PAT }} create-cura-package: - name: Create conan packages for Cura - runs-on: ubuntu-latest + name: Create conan package for Cura + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action needs: [parse-version, create-dependencies-packages] - steps: - - name: Call external create package - id: dispatch-create-action - uses: Codex-/return-dispatch@v1.14.0 - with: - owner: Ultimaker - repo: Cura-workflows - token: ${{ secrets.CURA_AUTORELEASE_PAT }} - workflow: conan-package-release.yml - ref: CURA-10769_automate_release_action - workflow_inputs: | - { - "repository": "Cura", - "ref_name": "${{ needs.parse-version.outputs.branch_name }}", - "version": "${{ inputs.cura_version }}", - "conan_release": "true", - "conan_user_channel": "ultimaker/stable", - "conan_internal": "false", - "conan_latest": "true", - "conan_recipe_root": "${{ matrix.conan_recipe_root }}" - } - - - name: Wait for package creation completion - uses: Codex-/await-remote-run@v1.12.2 - with: - owner: Ultimaker - repo: Cura-workflows - token: ${{ secrets.CURA_AUTORELEASE_PAT }} - run_id: ${{ steps.dispatch-create-action.outputs.run_id }} - run_timeout_seconds: 3600 + with: + repository: Cura + ref_name: ${{ needs.parse-version.outputs.branch_name }} + version: ${{ inputs.cura_version }} + conan_release: true + conan_user_channel: ultimaker/stable + conan_internal: false + conan_latest: true + secrets: inherit create-installers: name: Create installers From 2fce3a8173525c0a1a7a035debf911780b9a0ef4 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 09:31:58 +0200 Subject: [PATCH 55/88] Add secrets to action --- .github/workflows/release-process_release-candidate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 0a8bc23415..6237ce9e8f 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -109,6 +109,7 @@ jobs: conan_latest: true conan_recipe_root: ${{ matrix.conan_recipe_root }} token: ${{ secrets.CURA_AUTORELEASE_PAT }} + secrets: inherit create-cura-package: name: Create conan package for Cura From d8ebe0cfe22969ef9f057a2ee15a66f4e6b0e099 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 09:54:17 +0200 Subject: [PATCH 56/88] Remove inexisting token input --- .github/workflows/release-process_release-candidate.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 6237ce9e8f..ee52703bfb 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -108,7 +108,6 @@ jobs: conan_internal: false conan_latest: true conan_recipe_root: ${{ matrix.conan_recipe_root }} - token: ${{ secrets.CURA_AUTORELEASE_PAT }} secrets: inherit create-cura-package: From 9a969299c2cddb76a23a4f29d466304ac4c793a1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 10:03:02 +0200 Subject: [PATCH 57/88] Set exhaustive list of artifacts This makes sure the step will fail if some files are missing --- .../workflows/release-process_release-candidate.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index ee52703bfb..1aaad486de 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -5,7 +5,7 @@ on: workflow_call: inputs: cura_version: - description: 'Cura version number, e.g. 5.7, 5.7.2 or 5.8.0-beta.2' + description: 'Cura version number, e.g. 5.7.0, 5.7.2 or 5.8.0-beta.2' required: true type: string @@ -170,4 +170,12 @@ jobs: draft: true body-source: file body: formatted_changelog.txt - files: artifacts/UltiMaker-Cura-* + files: | + artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage + artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc + artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg + artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg + artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg + artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg + artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe + artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi From 3568538d2d5f37b25c2cf98d96700afea1426f07 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 10:08:11 +0200 Subject: [PATCH 58/88] Make sure all changed files are committed --- .github/workflows/release-process_feature-freeze.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index a376b6fcf5..e812369604 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -59,6 +59,5 @@ jobs: uses: stefanzweifel/git-auto-commit-action@v5.0.1 with: commit_message: Set conan package version ${{ needs.parse-version.outputs.package_version }} - file_pattern: conandata.yml branch: ${{ needs.parse-version.outputs.branch_name }} create_branch: true From 8a23981b893ee46ceaa888e817677672c86bf173 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 10:43:17 +0200 Subject: [PATCH 59/88] Use reusable action to freeze packages versions --- .../release-process_feature-freeze.yml | 42 +++---------------- .../release-process_release-candidate.yml | 37 +++++++--------- 2 files changed, 20 insertions(+), 59 deletions(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index e812369604..523a9a694f 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -14,8 +14,7 @@ jobs: name: Parse input version string runs-on: ubuntu-latest outputs: - package_version: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }}.0 - branch_name: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }} + package_version: ${{ steps.version_parser.outputs.major }}.${{ steps.version_parser.outputs.minor }}.0-alpha.1 steps: - name: Parse version string id: version_parser @@ -25,39 +24,8 @@ jobs: feature-freeze: name: Process feature freeze - runs-on: ubuntu-latest + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml needs: [parse-version] - strategy: - matrix: - repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] - include: - - main_branch: main - - repository: Cura - main_branch: CURA-10769_automate_release_action - - repository: fdm_materials - main_branch: master - steps: - - name: Checkout repo - uses: actions/checkout@v4 - with: - repository: Ultimaker/${{ matrix.repository }} - ref: ${{ matrix.main_branch }} - token: ${{ secrets.CURA_AUTORELEASE_PAT }} - - - name: Update conan package version - run: | - PACKAGE_VERSION=${{ needs.parse-version.outputs.package_version }} - sed -i "s/version:.*/version: \"$PACKAGE_VERSION\"/g" conandata.yml - - - name: Update resources conan package version - if: ${{ matrix.repository == 'Cura' }} - run: | - PACKAGE_VERSION=${{ needs.parse-version.outputs.package_version }} - sed -i "s/version:.*/version: \"$PACKAGE_VERSION\"/g" resources/conandata.yml - - - name: Create branch and commit - uses: stefanzweifel/git-auto-commit-action@v5.0.1 - with: - commit_message: Set conan package version ${{ needs.parse-version.outputs.package_version }} - branch: ${{ needs.parse-version.outputs.branch_name }} - create_branch: true + with: + cura_version: ${{ needs.parse-version.outputs.package_version }} + create_feature_branch: true diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 1aaad486de..0249077f2b 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -25,10 +25,18 @@ jobs: with: input_string: ${{ inputs.cura_version }} - prepare-cura-repo: - name: Update dependencies and find RC tag name - runs-on: ubuntu-latest + freeze-packages-versions: + name: Freeze packges versions + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml needs: [parse-version] + with: + cura_version: ${{ inputs.cura_version }} + create_feature_branch: false + + find-rc-tag: + name: Find RC tag name + runs-on: ubuntu-latest + needs: [freeze-packages-versions] outputs: tag_name: ${{ steps.find-available-tag-name.outputs.tag_name }} steps: @@ -39,21 +47,6 @@ jobs: fetch-tags: true fetch-depth: 0 - - name: Update Cura dependencies - run: | - PACKAGE_VERSION=${{ inputs.cura_version }} - sed -i "s/\"uranium\/.*/\"uranium\/$PACKAGE_VERSION\"/g" conandata.yml - sed -i "s/\"cura_resources\/.*/\"cura_resources\/$PACKAGE_VERSION\"/g" conandata.yml - sed -i "s/\"curaengine\/.*/\"curaengine\/$PACKAGE_VERSION\"/g" conandata.yml - sed -i "s/\"cura_binary_data\/.*/\"cura_binary_data\/$PACKAGE_VERSION\"/g" conandata.yml - sed -i "s/\"fdm_materials\/.*/\"fdm_materials\/$PACKAGE_VERSION\"/g" conandata.yml - - - name: Commit new dependencies versioning - uses: stefanzweifel/git-auto-commit-action@v5.0.1 - with: - commit_message: Set dependencies version ${{ inputs.cura_version }} - file_pattern: conandata.yml - - name: Find available tag name id: find-available-tag-name run: | @@ -71,7 +64,7 @@ jobs: create-tags: name: Create tags runs-on: ubuntu-latest - needs: [parse-version, prepare-cura-repo] + needs: [parse-version, find-rc-tag] strategy: matrix: repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] @@ -85,13 +78,13 @@ jobs: - name: Create tag run: | - git tag ${{ needs.prepare-cura-repo.outputs.tag_name }} - git push origin tag ${{ needs.prepare-cura-repo.outputs.tag_name }} + git tag ${{ needs.find-rc-tag.outputs.tag_name }} + git push origin tag ${{ needs.find-rc-tag.outputs.tag_name }} create-dependencies-packages: name: Create conan packages for dependencies uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action - needs: [parse-version, prepare-cura-repo] + needs: [parse-version, freeze-packages-versions] strategy: matrix: repository: [Cura, Uranium, CuraEngine, cura-binary-data, fdm_materials] From ef2fb67222cab8b1f72900fa4248b5f7c9db4cf9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 10:51:44 +0200 Subject: [PATCH 60/88] Set new version for testing --- .github/workflows/release-process_tester.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 09ebe920d1..8cb35b9b8d 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -5,15 +5,15 @@ on: push jobs: - #test-feature-freeze: - #uses: ./.github/workflows/release-process_feature-freeze.yml - #with: - #cura_version: 255.124 - #secrets: inherit + test-feature-freeze: + uses: ./.github/workflows/release-process_feature-freeze.yml + with: + cura_version: 255.125 + secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml - #needs: [test-feature-freeze] + needs: [test-feature-freeze] with: - cura_version: 255.124.0-beta.1 + cura_version: 255.125.0-beta.1 secrets: inherit From 565ccd3eba08671383791be07317e1549ca6d8a7 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 10:53:09 +0200 Subject: [PATCH 61/88] Set called script version --- .github/workflows/release-process_feature-freeze.yml | 2 +- .github/workflows/release-process_release-candidate.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index 523a9a694f..bdcccad117 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -24,7 +24,7 @@ jobs: feature-freeze: name: Process feature freeze - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-10769_automate_release_action needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 0249077f2b..95da8dc2a4 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -27,7 +27,7 @@ jobs: freeze-packages-versions: name: Freeze packges versions - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-10769_automate_release_action needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} From ec4455a73eb3ec57091b900bfab5ee2496b783e7 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 10:56:37 +0200 Subject: [PATCH 62/88] Change version to trigger build --- .github/workflows/release-process_tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 8cb35b9b8d..be4753ea21 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -8,12 +8,12 @@ jobs: test-feature-freeze: uses: ./.github/workflows/release-process_feature-freeze.yml with: - cura_version: 255.125 + cura_version: 255.126 secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml needs: [test-feature-freeze] with: - cura_version: 255.125.0-beta.1 + cura_version: 255.126.0-beta.1 secrets: inherit From 8c97cd3d9c90af083965b3855ffd250372bca974 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 10:58:03 +0200 Subject: [PATCH 63/88] Change version to trigger build --- .github/workflows/release-process_tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index be4753ea21..c9f185f242 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -8,12 +8,12 @@ jobs: test-feature-freeze: uses: ./.github/workflows/release-process_feature-freeze.yml with: - cura_version: 255.126 + cura_version: 255.127 secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml needs: [test-feature-freeze] with: - cura_version: 255.126.0-beta.1 + cura_version: 255.127.0-beta.1 secrets: inherit From 2452a748de084ed88778075a803680680ddede5e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 11:03:00 +0200 Subject: [PATCH 64/88] Give secrets to called scripts --- .github/workflows/release-process_feature-freeze.yml | 1 + .github/workflows/release-process_release-candidate.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index bdcccad117..b2b228603e 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -29,3 +29,4 @@ jobs: with: cura_version: ${{ needs.parse-version.outputs.package_version }} create_feature_branch: true + secrets: inherit diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 95da8dc2a4..1e2475fa1e 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -32,6 +32,7 @@ jobs: with: cura_version: ${{ inputs.cura_version }} create_feature_branch: false + secrets: inherit find-rc-tag: name: Find RC tag name From 63889fa18cb9e55944bb666402c82c96a61adeb4 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 12:39:01 +0200 Subject: [PATCH 65/88] Change version to trigger build --- .github/workflows/release-process_tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index c9f185f242..74a5ae7266 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -8,12 +8,12 @@ jobs: test-feature-freeze: uses: ./.github/workflows/release-process_feature-freeze.yml with: - cura_version: 255.127 + cura_version: 255.128 secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml needs: [test-feature-freeze] with: - cura_version: 255.127.0-beta.1 + cura_version: 255.128.0-beta.1 secrets: inherit From f17b53765865f17f9ecc0caf71d8ce5f13db9d63 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 12:45:15 +0200 Subject: [PATCH 66/88] Change version to trigger build --- .github/workflows/release-process_tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 74a5ae7266..54b73639b9 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -8,12 +8,12 @@ jobs: test-feature-freeze: uses: ./.github/workflows/release-process_feature-freeze.yml with: - cura_version: 255.128 + cura_version: 255.129 secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml needs: [test-feature-freeze] with: - cura_version: 255.128.0-beta.1 + cura_version: 255.129.0-beta.1 secrets: inherit From f994ffabd5c42dbf62ed95a4bcfa3dfb29971f44 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 12:54:07 +0200 Subject: [PATCH 67/88] Change version to trigger build --- .github/workflows/release-process_tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 54b73639b9..55b0ddca4d 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -8,12 +8,12 @@ jobs: test-feature-freeze: uses: ./.github/workflows/release-process_feature-freeze.yml with: - cura_version: 255.129 + cura_version: 255.130 secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml needs: [test-feature-freeze] with: - cura_version: 255.129.0-beta.1 + cura_version: 255.130.0-beta.1 secrets: inherit From a2a67947e81730146b38c4cdfaa83a2ef1648dcd Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 12:55:52 +0200 Subject: [PATCH 68/88] Change version to trigger build --- .github/workflows/release-process_tester.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 55b0ddca4d..4ee4ee465e 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -8,12 +8,12 @@ jobs: test-feature-freeze: uses: ./.github/workflows/release-process_feature-freeze.yml with: - cura_version: 255.130 + cura_version: 255.131 secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml needs: [test-feature-freeze] with: - cura_version: 255.130.0-beta.1 + cura_version: 255.131.0-beta.1 secrets: inherit From 1e0ffd05460ee731e233a5bb2bff234c252d6fec Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 15:33:18 +0200 Subject: [PATCH 69/88] Unzip artifacts before sending them --- .github/workflows/release-process_release-candidate.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 1e2475fa1e..2b26a8ae81 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -140,6 +140,10 @@ jobs: path: artifacts merge-multiple: true + - name: Unzip artifacts + working-directory: artifacts + run: ls *.zip | xargs -n 1 unzip + - name: Checkout Cura repo uses: actions/checkout@v4 with: From 3ea22f0f0c791c0547463ce5b0f5ba276cd2ce8c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 6 Jun 2024 15:33:35 +0200 Subject: [PATCH 70/88] Disable feature freeze --- .github/workflows/release-process_tester.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml index 4ee4ee465e..3cafbe0901 100644 --- a/.github/workflows/release-process_tester.yml +++ b/.github/workflows/release-process_tester.yml @@ -5,15 +5,15 @@ on: push jobs: - test-feature-freeze: - uses: ./.github/workflows/release-process_feature-freeze.yml - with: - cura_version: 255.131 - secrets: inherit + #test-feature-freeze: + #uses: ./.github/workflows/release-process_feature-freeze.yml + #with: + #cura_version: 255.131 + #secrets: inherit test-release-candidate: uses: ./.github/workflows/release-process_release-candidate.yml - needs: [test-feature-freeze] + #needs: [test-feature-freeze] with: cura_version: 255.131.0-beta.1 secrets: inherit From e8219726e7ea2669b39ab32b9104cb237de213db Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Jun 2024 08:55:57 +0200 Subject: [PATCH 71/88] Upload all artifacts (test) --- .../release-process_release-candidate.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 2b26a8ae81..2cf79e655f 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -140,10 +140,6 @@ jobs: path: artifacts merge-multiple: true - - name: Unzip artifacts - working-directory: artifacts - run: ls *.zip | xargs -n 1 unzip - - name: Checkout Cura repo uses: actions/checkout@v4 with: @@ -168,12 +164,4 @@ jobs: draft: true body-source: file body: formatted_changelog.txt - files: | - artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage - artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc - artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg - artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg - artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg - artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg - artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe - artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi + files: artifacts/* From c151dfa06c4360b6041de30115b18c886489d438 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Jun 2024 11:52:49 +0200 Subject: [PATCH 72/88] Upload release artifacts manually The action we use to create the release draft doesn't seem to upload artifacts correctly and doesn't report any error when files are missing, thus we do it manually. --- .../workflows/release-process_release-candidate.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 2cf79e655f..890e190e72 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -164,4 +164,14 @@ jobs: draft: true body-source: file body: formatted_changelog.txt - files: artifacts/* + + - name: Upload artifacts + run: | + gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage --clobber + gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc --clobber + gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg --clobber + gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg --clobber + gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg --clobber + gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg --clobber + gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe --clobber + gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi --clobber From 2f16b47522d46083d16e68392a65671409b3feb1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Jun 2024 13:16:41 +0200 Subject: [PATCH 73/88] Set GitHub token to upload artifact --- .github/workflows/release-process_release-candidate.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 890e190e72..540e3fe500 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -175,3 +175,5 @@ jobs: gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg --clobber gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe --clobber gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi --clobber + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 7fbe8e91ea381ad834afdd32cb9908e75d6e2a36 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Jun 2024 14:54:26 +0200 Subject: [PATCH 74/88] Rename installers before sending to release --- .../release-process_release-candidate.yml | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 540e3fe500..098481f28c 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -140,6 +140,17 @@ jobs: path: artifacts merge-multiple: true + - name: Rename artifacts + working-directory: artifacts + mv UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64-AppImage UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage + mv UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64-asc UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc + mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64-dmg UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg + mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64-pkg UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg + mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64-dmg UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg + mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64-pkg UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg + mv UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64-msi UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi + mv UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64-exe UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe + - name: Checkout Cura repo uses: actions/checkout@v4 with: @@ -164,16 +175,12 @@ jobs: draft: true body-source: file body: formatted_changelog.txt - - - name: Upload artifacts - run: | - gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage --clobber - gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc --clobber - gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg --clobber - gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg --clobber - gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg --clobber - gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg --clobber - gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe --clobber - gh release upload ${{ inputs.cura_version }} artifacts/UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi --clobber - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + files: | + UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage + UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc + UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg + UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg + UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg + UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg + UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi + UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe From 438dd91471dfd0a1461f8efb7e056d2d3ce95cd9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Jun 2024 14:55:01 +0200 Subject: [PATCH 75/88] fix syntax --- .github/workflows/release-process_release-candidate.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 098481f28c..92f35b6429 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -142,6 +142,7 @@ jobs: - name: Rename artifacts working-directory: artifacts + run: | mv UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64-AppImage UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage mv UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64-asc UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64-dmg UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg From 457d86cbe69c2c1f5381b077dd146a0d48def19b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Jun 2024 17:15:43 +0200 Subject: [PATCH 76/88] Don't rename artifacts --- .../release-process_release-candidate.yml | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 92f35b6429..8627c3988f 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -140,18 +140,6 @@ jobs: path: artifacts merge-multiple: true - - name: Rename artifacts - working-directory: artifacts - run: | - mv UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64-AppImage UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage - mv UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64-asc UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc - mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64-dmg UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg - mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64-pkg UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg - mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64-dmg UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg - mv UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64-pkg UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg - mv UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64-msi UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi - mv UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64-exe UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe - - name: Checkout Cura repo uses: actions/checkout@v4 with: @@ -176,12 +164,17 @@ jobs: draft: true body-source: file body: formatted_changelog.txt - files: | - UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage - UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc - UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg - UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg - UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg - UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg - UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi - UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe + + - name: Upload artifacts + working-directory: artifacts + run: | + gh release upload ${{ inputs.cura_version }} UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage --clobber + gh release upload ${{ inputs.cura_version }} UltiMaker-Cura-${{ inputs.cura_version }}-linux-X64.AppImage.asc --clobber + gh release upload ${{ inputs.cura_version }} UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.dmg --clobber + gh release upload ${{ inputs.cura_version }} UltiMaker-Cura-${{ inputs.cura_version }}-macos-ARM64.pkg --clobber + gh release upload ${{ inputs.cura_version }} UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.dmg --clobber + gh release upload ${{ inputs.cura_version }} UltiMaker-Cura-${{ inputs.cura_version }}-macos-X64.pkg --clobber + gh release upload ${{ inputs.cura_version }} UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.exe --clobber + gh release upload ${{ inputs.cura_version }} UltiMaker-Cura-${{ inputs.cura_version }}-win64-X64.msi --clobber + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9370f15f96d8ddf104a48c8ad960577a13158618 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Jun 2024 17:18:26 +0200 Subject: [PATCH 77/88] Display contents of directories --- .../release-process_release-candidate.yml | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 8627c3988f..48e8c730e8 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -134,12 +134,6 @@ jobs: runs-on: ubuntu-latest needs: [create-installers, parse-version] steps: - - name: Download artifacts - uses: actions/download-artifact@v4.1.7 - with: - path: artifacts - merge-multiple: true - - name: Checkout Cura repo uses: actions/checkout@v4 with: @@ -165,6 +159,21 @@ jobs: body-source: file body: formatted_changelog.txt + - name: Download artifacts + uses: actions/download-artifact@v4.1.7 + with: + path: artifacts + merge-multiple: true + + - name: Display contents + run: | + ls -lh + + - name: Display artifacts contents + working-directory: artifacts + run: | + ls -lh + - name: Upload artifacts working-directory: artifacts run: | From 91b25a3743d74622f7db09cd4e1fded342bdefc6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 7 Jun 2024 17:18:50 +0200 Subject: [PATCH 78/88] Use action download-artifact@v4 --- .github/workflows/installers.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index bd932b3346..ed9b109a58 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -132,7 +132,7 @@ jobs: fetch-depth: 1 - name: Download the run info - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: linux-run-info @@ -174,13 +174,13 @@ jobs: f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n") - name: Download linux installer jobs artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ steps.filename.outputs.LINUX }}-AppImage path: installers - name: Download linux installer jobs asc artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ steps.filename.outputs.LINUX }}-asc path: installers @@ -198,13 +198,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Download win msi installer jobs artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ steps.filename.outputs.WIN_MSI }}-msi path: installers - name: Download win exe installer jobs artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ steps.filename.outputs.WIN_EXE }}-exe path: installers @@ -222,13 +222,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Download MacOS (X64) dmg installer jobs artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ steps.filename.outputs.MAC_X64_DMG }}-dmg path: installers - name: Download MacOS (X64) pkg installer jobs artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ steps.filename.outputs.MAC_X64_PKG }}-pkg path: installers @@ -246,13 +246,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Download MacOS (ARM-64) dmg installer jobs artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ steps.filename.outputs.MAC_ARM_DMG }}-dmg path: installers - name: Download MacOS (ARM-64) pkg installer jobs artifacts - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: ${{ steps.filename.outputs.MAC_ARM_PKG }}-pkg path: installers From c55a541107e3c7b40b38511c3a5edeff668a2997 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Jun 2024 08:32:00 +0200 Subject: [PATCH 79/88] Remove debug print --- .github/workflows/release-process_release-candidate.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index 48e8c730e8..e43907f3f1 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -165,15 +165,6 @@ jobs: path: artifacts merge-multiple: true - - name: Display contents - run: | - ls -lh - - - name: Display artifacts contents - working-directory: artifacts - run: | - ls -lh - - name: Upload artifacts working-directory: artifacts run: | From d30e6b9eb0e6ca6c2f3fe5c3279f2ec98e9896ab Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Jun 2024 08:42:53 +0200 Subject: [PATCH 80/88] Use scripts from main branch (PR prep) --- .../release-process_feature-freeze.yml | 4 ++-- .../release-process_release-candidate.yml | 8 ++++---- .github/workflows/release-process_tester.yml | 19 ------------------- 3 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 .github/workflows/release-process_tester.yml diff --git a/.github/workflows/release-process_feature-freeze.yml b/.github/workflows/release-process_feature-freeze.yml index b2b228603e..3a07799665 100644 --- a/.github/workflows/release-process_feature-freeze.yml +++ b/.github/workflows/release-process_feature-freeze.yml @@ -2,7 +2,7 @@ name: Feature Freeze run-name: Feature freeze Cura ${{ inputs.cura_version }} by @${{ github.actor }} on: - workflow_call: + workflow_dispatch: inputs: cura_version: description: 'Cura version major and minor, e.g. 5.7' @@ -24,7 +24,7 @@ jobs: feature-freeze: name: Process feature freeze - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-10769_automate_release_action + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main needs: [parse-version] with: cura_version: ${{ needs.parse-version.outputs.package_version }} diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index e43907f3f1..fb62c5d9c5 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -2,7 +2,7 @@ name: Prepare Release Candidate run-name: Release Candidate for Cura ${{ inputs.cura_version }} by @${{ github.actor }} on: - workflow_call: + workflow_dispatch: inputs: cura_version: description: 'Cura version number, e.g. 5.7.0, 5.7.2 or 5.8.0-beta.2' @@ -27,7 +27,7 @@ jobs: freeze-packages-versions: name: Freeze packges versions - uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@CURA-10769_automate_release_action + uses: Ultimaker/Cura-workflows/.github/workflows/cura-set-packages-versions.yml@main needs: [parse-version] with: cura_version: ${{ inputs.cura_version }} @@ -84,7 +84,7 @@ jobs: create-dependencies-packages: name: Create conan packages for dependencies - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main needs: [parse-version, freeze-packages-versions] strategy: matrix: @@ -106,7 +106,7 @@ jobs: create-cura-package: name: Create conan package for Cura - uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@CURA-10769_automate_release_action + uses: ultimaker/cura-workflows/.github/workflows/conan-package-release.yml@main needs: [parse-version, create-dependencies-packages] with: repository: Cura diff --git a/.github/workflows/release-process_tester.yml b/.github/workflows/release-process_tester.yml deleted file mode 100644 index 3cafbe0901..0000000000 --- a/.github/workflows/release-process_tester.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Test release actions -run-name: Test - -on: - push - -jobs: - #test-feature-freeze: - #uses: ./.github/workflows/release-process_feature-freeze.yml - #with: - #cura_version: 255.131 - #secrets: inherit - - test-release-candidate: - uses: ./.github/workflows/release-process_release-candidate.yml - #needs: [test-feature-freeze] - with: - cura_version: 255.131.0-beta.1 - secrets: inherit From 1f12f776b065af3fff6088176591e37aec96bca1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Jun 2024 09:04:01 +0200 Subject: [PATCH 81/88] Use scripts from main branch (PR prep) --- .github/workflows/installers.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index ed9b109a58..0c2873cf31 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -65,7 +65,7 @@ env: jobs: default_values: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@CURA-10769_automate_release_action + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-default-value.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} latest_release: '5.6' @@ -73,7 +73,7 @@ jobs: latest_release_tag: 'nightly' windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-10769_automate_release_action + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -85,7 +85,7 @@ jobs: secrets: inherit linux-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@CURA-10769_automate_release_action + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-linux.yml@main needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -97,7 +97,7 @@ jobs: secrets: inherit macos-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10769_automate_release_action + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} @@ -109,7 +109,7 @@ jobs: secrets: inherit macos-arm-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@CURA-10769_automate_release_action + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-macos.yml@main needs: [ default_values ] with: cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }} From 3d1faf3581216fa5d2f6036d1e9c34f079684347 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Jun 2024 09:13:31 +0200 Subject: [PATCH 82/88] Remove useless branch checkout --- .github/workflows/release-process_release-candidate.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release-process_release-candidate.yml b/.github/workflows/release-process_release-candidate.yml index fb62c5d9c5..3d59817996 100644 --- a/.github/workflows/release-process_release-candidate.yml +++ b/.github/workflows/release-process_release-candidate.yml @@ -44,7 +44,6 @@ jobs: - name: Checkout repo uses: actions/checkout@v4 with: - ref: ${{ needs.parse-version.outputs.branch_name }} fetch-tags: true fetch-depth: 0 From dcea73efe687c124b5cc799968abb5bf72e65a4c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 10 Jun 2024 09:18:54 +0200 Subject: [PATCH 83/88] Use scripts from main branch (PR prep) --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 1fcc05ecc4..704aa4ddde 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -42,7 +42,7 @@ on: jobs: windows-installer: - uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@CURA-10769_automate_release_action + uses: ultimaker/cura-workflows/.github/workflows/cura-installer-windows.yml@main with: cura_conan_version: ${{ inputs.cura_conan_version }} conan_args: ${{ inputs.conan_args }} From 7f7dbd6b1a15db9e81717380553d31623e3b8292 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 10 Jun 2024 13:26:22 +0200 Subject: [PATCH 84/88] Only request permissions when token changed Since the permissions can only change with a token, we only need to check what the permissions at that moment (instead of every 60 seconds) Fixes CURA-11870 --- cura/API/Account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/API/Account.py b/cura/API/Account.py index c6027acdb5..d126a52d60 100644 --- a/cura/API/Account.py +++ b/cura/API/Account.py @@ -115,15 +115,15 @@ class Account(QObject): self._update_timer.setSingleShot(True) self._update_timer.timeout.connect(self.sync) - self._sync_services: Dict[str, int] = {} """contains entries "service_name" : SyncState""" - self.syncRequested.connect(self._updatePermissions) + self._sync_services: Dict[str, int] = {} def initialize(self) -> None: self._authorization_service.initialize(self._application.getPreferences()) self._authorization_service.onAuthStateChanged.connect(self._onLoginStateChanged) self._authorization_service.onAuthenticationError.connect(self._onLoginStateChanged) self._authorization_service.accessTokenChanged.connect(self._onAccessTokenChanged) + self._authorization_service.accessTokenChanged.connect(self._updatePermissions) self._authorization_service.loadAuthDataFromPreferences() @pyqtProperty(int, notify=syncStateChanged) From f7e298db65b8a7b8c901459455d8a3ab116d7df4 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 11 Jun 2024 15:12:55 +0200 Subject: [PATCH 85/88] Split overhang angle w.r.t. seams off from overhang angle. part of CURA-8076 --- resources/definitions/fdmprinter.def.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 124ba37967..26e6a0060c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8021,6 +8021,19 @@ "default_value": 90, "settable_per_mesh": true }, + "seam_overhang_angle": + { + "label": "Seam Overhanging Wall Angle", + "description": "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging.", + "unit": "\u00b0", + "type": "float", + "minimum_value": "0", + "minimum_value_warning": "2", + "maximum_value": "90", + "default_value": 90, + "value": "wall_overhang_angle", + "settable_per_mesh": true + }, "wall_overhang_speed_factor": { "label": "Overhanging Wall Speed", From 4a8fb601c43bf5bb187f090bb26301c7b9f3e8fc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 12 Jun 2024 13:07:27 +0200 Subject: [PATCH 86/88] Revert "Bump twisted from 21.2.0 to 23.8.0" This reverts commit 9ae3c6d4a2f56d38ee7d0267975cdac593f22314. --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3024096234..76339c884f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -213,9 +213,9 @@ requests==2.22.0 \ --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \ --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 # twisted -Twisted==23.8.0 \ - --hash=sha256:3c73360add17336a622c0d811c2a2ce29866b6e59b1125fd6509b17252098a24 \ - --hash=sha256:b8bdba145de120ffb36c20e6e071cce984e89fba798611ed0704216fb7f884cd +Twisted==21.2.0 \ + --hash=sha256:77544a8945cf69b98d2946689bbe0c75de7d145cdf11f391dd487eae8fc95a12 \ + --hash=sha256:aab38085ea6cda5b378b519a0ec99986874921ee8881318626b0a3414bb2631e constantly==15.1.0 \ --hash=sha256:586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 \ --hash=sha256:dd2fa9d6b1a51a83f0d7dd76293d734046aa176e384bf6e33b7e44880eb37c5d From 044cc00c5c99895bb59eb3e99aa5c8407059903a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 12 Jun 2024 13:29:23 +0200 Subject: [PATCH 87/88] Dependencies: Update attrs, as twisted depends on newer. --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3024096234..ba2b2927e0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -206,9 +206,9 @@ chardet==3.0.4 \ idna==2.8 \ --hash=sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407 \ --hash=sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c -attrs==21.2.0 \ - --hash=sha256:149e90d6d8ac20db7a955ad60cf0e6881a3f20d37096140088356da6c716b0b1 \ - --hash=sha256:ef6aaac3ca6cd92904cdd0d83f629a15f18053ec84e6432106f7a4d04ae4f5fb +attrs==21.3.0 \ + --hash=sha256:8f7335278dedd26b58c38e006338242cc0977f06d51579b2b8b87b9b33bff66c \ + --hash=sha256:50f3c9b216dc9021042f71b392859a773b904ce1a029077f58f6598272432045 requests==2.22.0 \ --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \ --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 From af267af13608870024d6c8b5e15e6a92c9cfa68a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 12 Jun 2024 14:06:35 +0200 Subject: [PATCH 88/88] Dependencies: Update incremental, as twisted depends on newer. --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index ba2b2927e0..c55e282fa5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -222,9 +222,9 @@ constantly==15.1.0 \ hyperlink==21.0.0 \ --hash=sha256:427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b \ --hash=sha256:e6b14c37ecb73e89c77d78cdb4c2cc8f3fb59a885c5b3f819ff4ed80f25af1b4 -incremental==21.3.0 \ - --hash=sha256:02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57 \ - --hash=sha256:92014aebc6a20b78a8084cdd5645eeaa7f74b8933f70fa3ada2cfbd1e3b54321 +incremental==22.10.0 \ + --hash=sha256:b864a1f30885ee72c5ac2835a761b8fe8aa9c28b9395cacf27286602688d3e51 \ + --hash=sha256:912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0 zope.interface==5.4.0 \ --hash=sha256:0f91b5b948686659a8e28b728ff5e74b1be6bf40cb04704453617e5f1e945ef3 \ --hash=sha256:3c02411a3b62668200910090a0dff17c0b25aaa36145082a5a6adf08fa281e54 \