From 0d017f725a34170078004558b9368b00029b1ae5 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 17 May 2024 09:56:49 +0200 Subject: [PATCH 1/2] 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 7591a30232..124ba37967 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6845,7 +6845,7 @@ "label": "Prime Tower Type", "description": "How to generate the prime tower:", "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 170c5115682caba0f00f993d3b0401c451811ac4 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 23 May 2024 11:49:35 +0200 Subject: [PATCH 2/2] Reduce permissions on printer-linter GitHub actions Previously they had no permission set, so by default all write access. We now specify only the required permissions for each of them. --- .github/workflows/printer-linter-pr-diagnose.yml | 3 +++ .github/workflows/printer-linter-pr-post.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/printer-linter-pr-diagnose.yml b/.github/workflows/printer-linter-pr-diagnose.yml index 1be20c4548..67fbe7247f 100644 --- a/.github/workflows/printer-linter-pr-diagnose.yml +++ b/.github/workflows/printer-linter-pr-diagnose.yml @@ -5,6 +5,9 @@ on: path: - "resources/**" +permissions: + contents: read + jobs: printer-linter-diagnose: name: Printer linter PR diagnose diff --git a/.github/workflows/printer-linter-pr-post.yml b/.github/workflows/printer-linter-pr-post.yml index 8bb1aaf028..526fdcdbaa 100644 --- a/.github/workflows/printer-linter-pr-post.yml +++ b/.github/workflows/printer-linter-pr-post.yml @@ -5,6 +5,9 @@ on: workflows: ["printer-linter-pr-diagnose"] types: [completed] +permissions: + issues: write + jobs: clang-tidy-results: # Trigger the job only if the previous (insecure) workflow completed successfully