From 656a3dc707b44422569a53ae4531325cf7833e21 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:02:17 +0200 Subject: [PATCH 1/7] Remove stray print --- .../Recommended/RecommendedQualityProfileSelector.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 87cb271ed4..bc5826fe7c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -43,7 +43,6 @@ Item qualityType = Cura.MachineManager.activeQualityType } else { qualityType = Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category) - print(Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category)) } Cura.IntentManager.selectIntent(model.intent_category, qualityType) } From 32eefbb404c1430e5542938bb8f0c2689407614c Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 13 Jul 2022 16:29:18 +0200 Subject: [PATCH 2/7] Removed the 'support_infill_sparse_thickness' setting from the global quality files and only added them to the PVA and BAM quality files. This prevents infill layer skipping during self support. Relates to PP-193 --- resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg | 1 + .../quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg | 1 + .../quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg | 1 + .../quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg | 1 - .../quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg | 2 -- resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg | 3 +-- resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg | 3 +-- .../quality/ultimaker3/um3_global_Normal_Quality.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg | 1 - 26 files changed, 17 insertions(+), 14 deletions(-) diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 64a6db0573..fd8f22a3fe 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 5c2f5635fc..0723122770 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index bc3928bab4..7ad6967e6b 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index 9dd15079c7..add681b5c6 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index 7e22a08939..fbf7d65477 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index e298848a90..07b91499e4 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = BB 0.8 [values] brim_replaces_support = False -layer_height = 0.4 material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index f52206e9b3..6177272235 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,11 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False -layer_height = 0.3 material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True -support_infill_sparse_thickness = 0.3 support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index fd9ec86036..048708b0d1 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -11,5 +11,4 @@ weight = -1 global_quality = True [values] -layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height +layer_height = 0.15 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index 3522f0b5a0..a67d97a78e 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -11,5 +11,4 @@ weight = 1 global_quality = True [values] -layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height +layer_height = 0.06 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index 5955a587f4..4a68719014 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 87415ecb05..577362391f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 97b9e33f60..416a175c81 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 85e3e2530a..1df9f6b97b 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index 5bcaf96f5f..7495130aa9 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index 7b31e48283..308d26bf62 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg index 3742eec814..5d2618a02d 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg index 4c7dbe5b28..88d6049ff9 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg index ff65fd5c57..eccccc6d42 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index e57c078d70..e2450cd6b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index def9d111c1..24f007b99b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index f69ecfbb94..b98235718b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 17b3dd2467..40dcd5da35 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index 47dcbe57fa..d5397c44eb 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index 34d2946524..8ab6de530f 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index 14b0a3bb4e..a3153e8718 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index ed099f85bd..ef68e808dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height From 107d12856d64eb95ace3d09b6b2114744d38ea0d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 13 Jul 2022 13:13:21 +0200 Subject: [PATCH 3/7] Remove fill colours from this icon Otherwise the theme won't have any effect on it since 5.0. Done as a 5 minute fix. --- plugins/ModelChecker/model_checker.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/ModelChecker/model_checker.svg b/plugins/ModelChecker/model_checker.svg index ce9594302e..e63e082e27 100644 --- a/plugins/ModelChecker/model_checker.svg +++ b/plugins/ModelChecker/model_checker.svg @@ -1,7 +1,7 @@ - - - - + + + + From 771856fd607bc6c1e6e4763fbdbdb8bcea7b2844 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 13 Jul 2022 18:56:24 +0200 Subject: [PATCH 4/7] Use workflow from main --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index df260ed8c2..4da369dc6a 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -62,7 +62,7 @@ env: jobs: conan-recipe-version: - uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main with: project_name: cura From 8492b2f11facc804413c059035e088f1a514662f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 13 Jul 2022 18:57:46 +0200 Subject: [PATCH 5/7] Use workflow from main --- .github/workflows/conan-package.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index fdf83eb3b1..d9d2eaf4ef 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -48,13 +48,13 @@ on: jobs: conan-recipe-version: - uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main with: project_name: cura conan-package-export-macos: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} @@ -68,7 +68,7 @@ jobs: conan-package-export-linux: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} @@ -82,7 +82,7 @@ jobs: conan-package-export-windows: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} @@ -98,7 +98,7 @@ jobs: if: ${{ always() }} needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] - uses: ultimaker/cura/.github/workflows/notify.yml@5.1 + uses: ultimaker/cura/.github/workflows/notify.yml@main with: success: ${{ contains(join(needs.*.result, ','), 'success') }} success_title: "New Conan recipe exported in ${{ github.repository }}" From 7dc378fb4c0f108e900fdd6e5ef7d6618c453d75 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 13 Jul 2022 19:31:01 +0200 Subject: [PATCH 6/7] remove reference to curaengine copy-paste left over --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 4da369dc6a..b52f1a5f02 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -71,7 +71,7 @@ jobs: needs: [ conan-recipe-version ] steps: - - name: Checkout CuraEngine + - name: Checkout uses: actions/checkout@v3 - name: Setup Python and pip From b3cc3818b5b9b67a1d58a0495e096e415d8ac7ae Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 09:18:37 +0200 Subject: [PATCH 7/7] various fixes to workflow Contributes to CURA-9365 --- .github/workflows/conan-package.yml | 8 ++++---- .github/workflows/conan-recipe-version.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index d9d2eaf4ef..a96afaedab 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -60,7 +60,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'macos-10.15' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -74,7 +74,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'ubuntu-20.04' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -88,7 +88,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'windows-2022' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -96,7 +96,7 @@ jobs: notify-export: if: ${{ always() }} - needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] + needs: [ conan-recipe-version, conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] uses: ultimaker/cura/.github/workflows/notify.yml@main with: diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 8e4e38553b..70f28b0290 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -76,7 +76,7 @@ jobs: # FIXME: for when we push a tag (such as an release) if is_tag: - branch_version = tools.Version("2.3.5") + branch_version = tools.Version("${{ github.ref_name }}") else: try: branch_version = tools.Version(repo.active_branch.name)