Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Np 186 seperate cura resources #19039

Merged
merged 13 commits into from
May 10, 2024
Merged

Conversation

jellespijker
Copy link
Member

@jellespijker jellespijker commented May 7, 2024

Description

Splits up the creation of the Conan package for printer, profile, resources. This will allow for multiple consumers to these shared resources. It will also lighten the the Cura conan packages, since it now doesn't need to package the meshes and definitions when there are only code changes. The version number is reused from the conandata.yml defined in the Cura root.

Downside is that we also need to trigger the cura_resources for release packages, in the cura_workflows.

See the following related PR's:

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:

Added a new Conanfile for handling Cura resources which includes definitions, extruders, intent, meshes, quality, and variants. Also, updated the `.github/workflows/conan-package.yml` for specific paths and added a new GitHub workflow `conan-package-resources.yml` for handling the packaging of resources.

Contribute to NP-186
Conan-package workflows in both 'conan-package.yml' and 'conan-package-resources.yml' have been updated to use a specific branch ('NP-186_seperate_cura_resources') instead of 'main'. Further adjustments will be needed after the branch merge. Also, 'conan_recipe_root' attribute was added in 'conan-package-resources.yml'.

Contribute to NP-186
The changes mainly include improvements to the code layout and maintainability in conanfile.py script. With additional importations and enhancing the file copy operations, the process is made clearer and reusable. Meanwhile, conandata.yml has been removed for redundancy in favor of on-the-fly version data updates.

Contribute to NP-186
A new dependency 'cura_resources' has been added to the conandata.yml. The handling of 'cura_resources' has been updated, now including specific sections for definitions, extruders, intent, meshes, quality and variants. GitHub Actions workflows and conan scripts have been adjusted accordingly to include these changes.

Contribute to NP-186
Resource directories in the Conanfile have been updated to include full resource paths and also preserve the original directory structure when copying. The 'keep_path' option has been set to true to maintain the original path structure during the copying process.

Contribute to NP-186
Additional paths for Cura resources are appended in the package information, for use in defining the Cura resource directory. This modification enhances the path setup in conanfile.py, offering greater versatility for referencing Cura resources.

Contribute to NP-186
Contribute to NP-186
Contribute to NP-186
resources/conanfile.py Outdated Show resolved Hide resolved
resources/conanfile.py Outdated Show resolved Hide resolved
Added new paths to CURA_ENGINE_SEARCH_PATH, specifically under "definitions" and "extruders". This ensures these directories are properly detected and searched in the Cura Engine.

Contribute to NP-186
Copy link
Contributor

@wawanbreton wawanbreton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor remarks, but this all makes sense. I'm happy that you didn't split the resources to an other repository 😊

conandata.yml Outdated Show resolved Hide resolved
resources/conanfile.py Outdated Show resolved Hide resolved
resources/conanfile.py Outdated Show resolved Hide resolved
@jellespijker jellespijker merged commit 5e731b8 into main May 10, 2024
3 of 4 checks passed
@jellespijker jellespijker deleted the NP-186_seperate_cura_resources branch May 10, 2024 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants