From 9da46ba53374616e36caa7f41a8837a3b35178aa Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Fri, 25 Nov 2022 11:19:37 +0100 Subject: [PATCH 1/3] PR template --- docs/PULL_REQUEST_TEMPLATE.md | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 docs/PULL_REQUEST_TEMPLATE.md diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..b4009c4d04 --- /dev/null +++ b/docs/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,31 @@ +# Description + +Please include a summary of which issue is fixed or feature was added. Please also include relevant motivation and context. +If this pull request adds settings definitions for machines/materials, list them here. + +This fixes... OR This improves... + +## Type of change + +Please delete options that are not relevant. + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Setting definition file(s) +- [ ] Translations + +# How Has This Been Tested? + +Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration + +- [ ] Test A +- [ ] Test B + +**Test Configuration**: +* Operating System: + +# Checklist: + +- [ ] My code follows the style guidelines of this project +- [ ] I have commented my code, particularly in hard-to-understand areas +- [ ] I have uploaded any files required to test this change \ No newline at end of file From 2f5053da6e90b07ea7d3e328a5cb02a26fe087ec Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 7 Jan 2023 14:19:39 +0100 Subject: [PATCH 2/3] check on version --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 1aa61b73e4..ebd51de1ac 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -134,7 +134,7 @@ jobs: version = tools.Version(tag) except ConanException: continue - if version > latest_branch_version and latest_branch_version < tools.Version("10.0.0"): + if version > latest_branch_version and version < tools.Version("10.0.0"): # FIXME: stupid old Cura tags 13.04 etc. keep popping up latest_branch_version = version latest_branch_tag = repo.tag(tag) From 7a29c99700724759bf932ac68e5be3b64f9a6b8f Mon Sep 17 00:00:00 2001 From: jspijker Date: Sat, 7 Jan 2023 14:45:51 +0100 Subject: [PATCH 3/3] Moved PR template to .github Added contribution link and code style links --- .github/PULL_REQUEST_TEMPLATE.md | 33 ++++++++++++++++++++++++++++++++ docs/PULL_REQUEST_TEMPLATE.md | 31 ------------------------------ 2 files changed, 33 insertions(+), 31 deletions(-) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 docs/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000..a6327de3b6 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,33 @@ +# Description + + + +## Type of change + + + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Printer definition file(s) +- [ ] Translations + +# How Has This Been Tested? + + + +- [ ] Test A +- [ ] Test B + +**Test Configuration**: +* Operating System: + +# Checklist: + + +- [ ] My code follows the style guidelines of this project as described in [UltiMaker Meta](https://github.com/Ultimaker/Meta) and [Cura QML best practices](https://github.com/Ultimaker/Cura/wiki/QML-Best-Practices) +- [ ] I have read the [Contribution guide](https://github.com/Ultimaker/Cura/blob/main/contributing.md) +- [ ] I have commented my code, particularly in hard-to-understand areas +- [ ] I have uploaded any files required to test this change \ No newline at end of file diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index b4009c4d04..0000000000 --- a/docs/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,31 +0,0 @@ -# Description - -Please include a summary of which issue is fixed or feature was added. Please also include relevant motivation and context. -If this pull request adds settings definitions for machines/materials, list them here. - -This fixes... OR This improves... - -## Type of change - -Please delete options that are not relevant. - -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ ] New feature (non-breaking change which adds functionality) -- [ ] Setting definition file(s) -- [ ] Translations - -# How Has This Been Tested? - -Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration - -- [ ] Test A -- [ ] Test B - -**Test Configuration**: -* Operating System: - -# Checklist: - -- [ ] My code follows the style guidelines of this project -- [ ] I have commented my code, particularly in hard-to-understand areas -- [ ] I have uploaded any files required to test this change \ No newline at end of file