Merge pull request #327 from Ultimaker/CURA-11622_conan_v2

Cura 11622 conan v2

.github/workflows/cicd.yml

@@ -1,4 +1,3 @@
----
 name: CI/CD
 on: [push, pull_request]
 jobs:
@@ -8,7 +7,7 @@ jobs:
     container: python:3.7-slim
     steps:
     - name: Checkout master
-      uses: actions/checkout@v1.2.0
+      uses: actions/checkout@v4
     - name: Install lxml
       run: python -m pip install lxml==4.6.5
     - name:

.github/workflows/conan-package.yml

@@ -13,21 +13,17 @@ on:
     branches:
       - main
       - master
-      - 'PP-*'
       - 'CURA-*'
+      - 'PP-*'
       - 'NP-*'
       - '[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
-    with:
-      project_name: fdm_materials
-
-  conan-package-export-linux:
-    needs: [ conan-recipe-version ]
-    uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-export.yml@main
+  conan-package:
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package.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_windows: false
+      platform_mac: false
+      install_system_dependencies: false
     secrets: inherit

conanfile.py

@@ -5,7 +5,7 @@
 from conan.tools.scm import Version
 from conan.errors import ConanInvalidConfiguration
 
-required_conan_version = ">=1.56.0"
+required_conan_version = ">=2.7.0"
 
 
 class FDM_MaterialsConan(ConanFile):
@@ -31,10 +31,6 @@ def export_sources(self):
         copy(self, "*.fdm_material", self.recipe_folder, self.export_sources_folder)
         copy(self, "*.sig", self.recipe_folder, self.export_sources_folder)
 
-    def validate(self):
-        if Version(self.version) <= Version("4"):
-            raise ConanInvalidConfiguration("Only versions 5+ are support")
-
     def package(self):
         copy(self, "*.fdm_material", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
         copy(self, "*.sig", self.source_folder, os.path.join(self.package_folder, "res", "resources", "materials"), keep_path = False)
@@ -43,7 +39,6 @@ def package_info(self):
         self.cpp_info.includedirs = []
         self.cpp_info.resdirs = ["res"]
         self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res", "resources"))
-        self.env_info.CURA_RESOURCES.append(os.path.join(self.package_folder, "res", "resources"))
 
     def package_id(self):
         self.info.clear()