Skip to content
This repository has been archived by the owner on Aug 22, 2024. It is now read-only.

CURA-10831 #13

Merged
merged 4 commits into from
Dec 8, 2023
Merged

CURA-10831 #13

merged 4 commits into from
Dec 8, 2023

Conversation

jellespijker
Copy link
Member

@jellespijker jellespijker commented Dec 5, 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 CuraEngine Gradual Flow dependencies maintained by UltiMaker (e.q.: curaengine_grpc_definitions) 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.

NOTE: Since technically these changes would result in version: 0.1.1-beta.0+git_sha, which would cause all kinds of issues in Cura with the settings key _plugin_gradual_flow_0_1_1__ hence by putting the version in the conandata.yml to 0.1.0-beta.2 I could cheat a bit without writing the upgrade scripts etc during the ticket.

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:

Contributes to CURA-10831
Contributes to CURA-10831
Contributes to CURA-10831
@jellespijker jellespijker changed the base branch from main to 0.1 December 5, 2023 09:11
@jellespijker jellespijker mentioned this pull request Dec 6, 2023
10 tasks
@jellespijker jellespijker merged commit a6672e0 into 0.1 Dec 8, 2023
4 checks passed
@jellespijker jellespijker deleted the CURA-10831 branch December 8, 2023 13:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant