Cura 10831 #17475
Merged
Cura 10831 #17475
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This will allow workflow automations to easily create release branches and set the versions Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
This commit updates the Uranium dependency in the Conan file and introduces an internationalization (i18n) option. It refactor the devtool checks to check for the "enable_i18n" option instead. Lastly, cleanups and adjustments are done in preparation for enabling i18n in the build process. Contributes to CURA-10831
should be `enable_i18n` Contributes to CURA-10831
Contributes to CURA-10831
Removed redundant workflow dispatch inputs and comments in .github/workflows/conan-package.yml. These were unnecessary for the push-based workflow and have been simplified to streamline the process and make it more efficient. Contributes to CURA-10831
# Conflicts: # conanfile.py
Contribute to CURA-10831
Contribute to CURA-10831
# Conflicts: # .github/workflows/conan-package-create.yml # .github/workflows/conan-package.yml
Contributes to CURA-10831
conanfile.py
Outdated
Comment on lines
326
to
327
| if "fdm_materials" in req: | ||
| continue |
There was a problem hiding this comment.
Why would fdm_materials be in the internal conan requirements?
There was a problem hiding this comment.
Otherwise you will endup with a conflict when building with the internal option True
…URA-10831 # Conflicts: # conanfile.py
Contribute to CURA-10831
Contribute to CURA-10831
Contributes to CURA-10831
# Conflicts: # conanfile.py
Contribute to CURA-10831
Contribute to CURA-10831
Contribute to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
For those that wants to build a OS specific installer Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
This reverts commit 6140d5a.
Somehow pytest can't be found on the PATH Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
# Conflicts: # conanfile.py
Contributes to CURA-10831
Contributes to CURA-10831
# Conflicts: # conanfile.py
10 tasks
The attribute 'enterprise' in conanfile.py was incorrectly named and has been renamed to 'internal'. This revision ensures that options are accessed correctly to avoid potential issues in usage. Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
casperlamboo
approved these changes
Dec 8, 2023
Co-authored-by: Casper Lamboo <c.lamboo@ultimaker.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Ported a lot of workflow to use the reusable workflows in the new Cura-workflows repository. See PR: Ultimaker/cura-workflows#1
The biggest impact on this repository is that the version of the conan package is now determined by the
versionkey inconandata.ymland no longer determined based on the git tag. During a push the Conan user, channel is determined based Github runner context, see theconan-recipe-versions.ymlin the Cura-workflows and the semver build metadata is added from the sha of the reference name (git hash).Furthermore the Cura dependencies maintained by UltiMaker (e.q.: fdm_materials, uranium, curaengine) are no longer specified in the
conanfile.pybut are also present in theconandata.ymlwhich allows us to automate the user and channel on main and release branches in the future. Since it is a yaml file which can be read in and easily changed by an automated workflow. For instance change the Conan channel tostablewhen we create the release branch. Or pin to specific conan package release version (e.q.:curaengine/5.7.0@_/_) when we create an actual release.Type of change
How Has This Been Tested?
Test Configuration:
Checklist: