From d56edc2d16a67d6b60778eee999a8df256a4f6bb Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 8 Mar 2023 09:11:19 +0100 Subject: [PATCH 1/2] Unpinned dependencies for the 5.3.1 development --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index aca26ba1db..d6d8f2f468 100644 --- a/conanfile.py +++ b/conanfile.py @@ -279,12 +279,12 @@ class CuraConan(ConanFile): def requirements(self): self.requires("pyarcus/5.2.2") - self.requires("curaengine/5.3.0") + self.requires("curaengine/(latest)@ultimaker/stable") self.requires("pysavitar/5.2.2") self.requires("pynest2d/5.2.2") - self.requires("uranium/5.3.0") - self.requires("fdm_materials/5.3.0") - self.requires("cura_binary_data/5.3.0") + self.requires("uranium/(latest)@ultimaker/stable") + self.requires("fdm_materials/(latest)@ultimaker/stable") + self.requires("cura_binary_data/(latest)@ultimaker/stable") self.requires("cpython/3.10.4") if self.options.internal: self.requires("cura_private_data/(latest)@ultimaker/testing") From 73e0fd74b576dd16deac04a9eded41ffb8d3ee84 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 8 Mar 2023 10:26:46 +0100 Subject: [PATCH 2/2] fixed version determination on release branch after release --- .github/workflows/conan-recipe-version.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 4964dc4903..5595fcd278 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -170,6 +170,8 @@ jobs: # An actual full release has been created, we are working on patch bump_up_patch = int(str(latest_branch_version.patch)) + 1 actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-beta.1+{buildmetadata}{channel_metadata}" + elif latest_branch_version.pre is None: + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{int(latest_branch_version.patch.value) + 1}-beta.1+{buildmetadata}{channel_metadata}" else: # An beta release has been created we are working toward a next beta or full release bump_up_release_tag = int(str(latest_branch_version.pre).split('.')[1]) + 1