From fe8a405d143f1cd0592c5ff788f23258e3ee7980 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Sep 2024 14:35:38 +0200 Subject: [PATCH 1/8] Update recipe and remove obsolete file --- .github/workflows/requirements-runner.txt | 0 conanfile.py | 10 ++++------ 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 .github/workflows/requirements-runner.txt diff --git a/.github/workflows/requirements-runner.txt b/.github/workflows/requirements-runner.txt deleted file mode 100644 index e69de29..0000000 diff --git a/conanfile.py b/conanfile.py index 02a1dc7..1c7d9b5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -5,7 +5,7 @@ from conan.tools.scm import Version from conan.tools.files import copy, update_conandata -required_conan_version = ">=1.59.0" +required_conan_version = ">=2.7.0" class CuraBinaryDataConan(ConanFile): @@ -51,10 +51,8 @@ def package_info(self): self.runenv_info.append_path("PATH", os.path.join(self.cpp.package.resdirs[2], "arduino", "CP210x_6.7.4")) self.runenv_info.append_path("PATH", os.path.join(self.cpp.package.resdirs[2], "arduino", "FTDI USB Drivers", "amd64")) - def package_id(self): + def compatibility(self): del self.info.settings.compiler del self.info.settings.build_type - if self.settings.os != "Windows": - compatible_pkg = self.info.clone() - compatible_pkg.settings.os = "Linux" - self.compatible_packages.append(compatible_pkg) + if self.info.settings.os != "Windows": + return [{"settings": [("os", "Linux")]}] From f58dc1ee36f493d340d2775c0d29db8f9c3afa6e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Sep 2024 14:39:13 +0200 Subject: [PATCH 2/8] Use common workflow --- .github/workflows/conan-package.yml | 36 ++++++++--------------------- 1 file changed, 9 insertions(+), 27 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index a93c586..910f4a8 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -5,45 +5,27 @@ on: paths: - 'cura/**' - 'uranium/**' - - 'windows' + - 'windows/**' - '.github/workflows/conan-package.yml' - - '.github/workflows/requirements-runner.txt' - 'conanfile.py' - 'conandata.yml' branches: - main + - master - 'CURA-*' + - 'PP-*' + - 'NP-*' - '[0-9].[0-9]*' + - '[0-9].[0-9][0-9]*' tags: - '[0-9]+.[0-9]+.[0-9]*' - '[0-9]+.[0-9]+.[0-9]' jobs: - conan-recipe-version: - uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main +# FIXME: Use main once merged + conan-package: + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: project_name: cura_binary_data - - conan-package-export: - needs: [ conan-recipe-version ] - uses: ultimaker/cura-workflows/.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 }} + platform_mac: false secrets: inherit - - conan-package-create-windows: - needs: [ conan-recipe-version, conan-package-export ] - - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - secrets: inherit - - conan-package-create-linux: - needs: [ conan-recipe-version, conan-package-export ] - - uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main - with: - recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} - secrets: inherit \ No newline at end of file From 36674c58af98557eaf7c522277f0d4fbcab8207c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 18 Sep 2024 14:46:58 +0200 Subject: [PATCH 3/8] Don't install system dependencies --- .github/workflows/conan-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 910f4a8..da0d217 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -28,4 +28,5 @@ jobs: with: project_name: cura_binary_data platform_mac: false + install_system_dependencies: false secrets: inherit From 9ee32ea226cf7a84ed976f753ac3f45edfcadfa5 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 25 Sep 2024 15:29:40 +0200 Subject: [PATCH 4/8] Update variable name --- .github/workflows/conan-package.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index da0d217..41b1766 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -26,7 +26,7 @@ jobs: conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: - project_name: cura_binary_data + package_name: cura_binary_data platform_mac: false install_system_dependencies: false secrets: inherit From fc7f8ba9d42325fc12b7ce4fcea69a94061c47e0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 13:41:13 +0100 Subject: [PATCH 5/8] Add placeholder folder for uranium resources --- uranium/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 uranium/README.md diff --git a/uranium/README.md b/uranium/README.md new file mode 100644 index 0000000..8e69c34 --- /dev/null +++ b/uranium/README.md @@ -0,0 +1 @@ +Place uranium specific resources here From f885d46c81daf0c2f6158c491196dea352733d00 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 14 Nov 2024 13:48:44 +0100 Subject: [PATCH 6/8] Set uranium resources at proper location --- uranium/{ => resources}/README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename uranium/{ => resources}/README.md (100%) diff --git a/uranium/README.md b/uranium/resources/README.md similarity index 100% rename from uranium/README.md rename to uranium/resources/README.md From 16ae4398b685ef060a7bb5cec1a67903e045524e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 27 Nov 2024 17:30:10 +0100 Subject: [PATCH 7/8] Use simplified version of package creation workflow --- .github/workflows/conan-package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 41b1766..0d94c38 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -26,7 +26,6 @@ jobs: conan-package: uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 with: - package_name: cura_binary_data platform_mac: false install_system_dependencies: false secrets: inherit From 24b645bf7c75766700dfe514fff307a56a865d49 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 4 Dec 2024 13:19:10 +0100 Subject: [PATCH 8/8] Prepare for merge CURA-11622 --- .github/workflows/conan-package.yml | 3 +-- conanfile.py | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 0d94c38..ba99da7 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -22,9 +22,8 @@ on: - '[0-9]+.[0-9]+.[0-9]' jobs: -# FIXME: Use main once merged conan-package: - uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2 + uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@main with: platform_mac: false install_system_dependencies: false diff --git a/conanfile.py b/conanfile.py index 1c7d9b5..e2b1460 100644 --- a/conanfile.py +++ b/conanfile.py @@ -31,10 +31,6 @@ def export_sources(self): copy(self, "*", os.path.join(self.recipe_folder, "uranium"), os.path.join(self.export_sources_folder, "uranium")) copy(self, "*", os.path.join(self.recipe_folder, "windows"), os.path.join(self.export_sources_folder, "windows")) - def validate(self): - if (self.version != None) and (Version(self.version) <= Version("4")): - raise ConanInvalidConfiguration("Only versions 5+ are supported!") - def layout(self): self.cpp.package.resdirs = [os.path.join("resources", "cura"), os.path.join("resources", "uranium"), "windows"]