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

CURA-10831 #929

Merged
merged 15 commits into from
Dec 8, 2023
Merged

CURA-10831 #929

merged 15 commits into from
Dec 8, 2023

Conversation

jellespijker
Copy link
Member

@jellespijker jellespijker commented Dec 6, 2023

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 version key in conandata.yml and no longer determined based on the git tag. During a push the Conan user, channel is determined based Github runner context, see the conan-recipe-versions.yml in the Cura-workflows and the semver build metadata is added from the sha of the reference name (git hash).

Furthermore the Uranium dependencies maintained by UltiMaker (e.q.: pyarcus) are no longer specified in the conanfile.py but are also present in the conandata.yml which 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 to stable when we create the release branch. Or pin to specific conan package release version (e.q.: curaengine_grpc_definitions/0.2.0@_/_) when we create an actual release.

When you now create a release branch now you would need to do this manually.

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)

How Has This Been Tested?

  • Locally
  • Remote

Test Configuration:

  • Operating System: Linux, Windows, Mac

Checklist:

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
Contributes to CURA-10831
Contributes to CURA-10831
Contribute to CURA-10831
# Conflicts:
#	conanfile.py
Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
@jellespijker jellespijker mentioned this pull request Dec 6, 2023
10 tasks
Contributes to CURA-10831
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/conan-package.yml Outdated Show resolved Hide resolved
.github/workflows/unit-test-post.yml Outdated Show resolved Hide resolved
.github/workflows/unit-test.yml Outdated Show resolved Hide resolved
.github/workflows/unit-test.yml Outdated Show resolved Hide resolved
@jellespijker jellespijker merged commit 235adbb into main Dec 8, 2023
2 checks passed
@jellespijker jellespijker deleted the CURA-10831 branch December 11, 2023 06:49
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.

2 participants