GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 11:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update cura_resources recipe and workflow

Browse Source
This commit is contained in:
Erwan MATHIEU 2024-09-24 10:10:33 +02:00
parent 7b48da3166
commit fb5e4f8553
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/workflows/conan-package-resources.yml vendored
View File

@ -20,21 +20,13 @@ on:
- '[0-9].[0-9]*' - '[0-9].[0-9]*'
- '[0-9].[0-9][0-9]*' - '[0-9].[0-9][0-9]*'
env:
CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
CONAN_PASSWORD_CURA: ${{ secrets.CONAN_PASS }}
jobs: jobs:
conan-recipe-version: # FIXME: Use main once merged
uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main conan-package:
uses: ultimaker/cura-workflows/.github/workflows/conan-package.yml@CURA-11622_conan_v2
with: with:
project_name: cura_resources project_name: cura_resources
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 }}
conan_recipe_root: "./resources/" conan_recipe_root: "./resources/"
platform_windows: false
platform_mac: false
secrets: inherit secrets: inherit

7
resources/conanfile.py
View File

@ -5,7 +5,7 @@ from conan.tools.files import copy, update_conandata
from conan.tools.scm import Version from conan.tools.scm import Version
from conan.errors import ConanInvalidConfiguration from conan.errors import ConanInvalidConfiguration
required_conan_version = ">=1.58.0 <2.0.0" required_conan_version = ">=2.7.0"
class CuraResource(ConanFile): class CuraResource(ConanFile):
@ -17,7 +17,7 @@ class CuraResource(ConanFile):
topics = ("conan", "cura") topics = ("conan", "cura")
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
no_copy_source = True no_copy_source = True
package_type = "header-library"
@property @property
def _shared_resources(self): def _shared_resources(self):
@ -54,9 +54,6 @@ class CuraResource(ConanFile):
self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res")) self.runenv_info.append_path("CURA_RESOURCES", os.path.join(self.package_folder, "res"))
self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions")) self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "definitions"))
self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders")) self.runenv_info.append_path("CURA_ENGINE_SEARCH_PATH", os.path.join(self.package_folder, "res", "extruders"))
self.env_info.CURA_RESOURCES.append(os.path.join(self.package_folder, "res"))
self.env_info.CURA_ENGINE_SEARCH_PATH.append(os.path.join(self.package_folder, "res", "definitions"))
self.env_info.CURA_ENGINE_SEARCH_PATH.append(os.path.join(self.package_folder, "res", "definitions"))
def package_id(self): def package_id(self):
self.info.clear() self.info.clear()