From aa2cb76135cae360f16ec87b63005b3f1c414d00 Mon Sep 17 00:00:00 2001
From: jspijker <j.spijker@ultimaker.com>
Date: Tue, 31 Jan 2023 13:30:31 +0100
Subject: [PATCH] take new minor release branches into account

---
 .github/workflows/conan-recipe-version.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml
index ebd51de1ac..3d5da55d6a 100644
--- a/.github/workflows/conan-recipe-version.yml
+++ b/.github/workflows/conan-recipe-version.yml
@@ -159,7 +159,9 @@ jobs:
                                 else:
                                     channel_metadata = f"{channel}_{no_commits}"
                             if is_release_branch:
-                                if latest_branch_version.prerelease == "":
+                                if latest_branch_version.prerelease == "" and branch_version > latest_branch_version:
+                                    actual_version = f"{branch_version.major}.{branch_version.minor}.0-beta.1+{buildmetadata}{channel_metadata}"
+                                elif latest_branch_version.prerelease == "":
                                     # An actual full release has been created, we are working on patch
                                     bump_up_patch = int(latest_branch_version.patch) + 1
                                     actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-beta.1+{buildmetadata}{channel_metadata}"