From c737be9867fcc7a2402987ac516a6726ba2b6ce5 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Thu, 8 Jun 2023 15:11:36 +0200 Subject: [PATCH] fix versioning for 5.4 --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index afa09a6d50..097b9f5dd6 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -160,7 +160,7 @@ jobs: else: channel_metadata = f"{channel}_{sha_commit}" if is_release_branch: - if latest_branch_version.pre == "" and branch_version > latest_branch_version: + if (latest_branch_version.pre == "" or latest_branch_version.pre is None) 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.pre == "": # An actual full release has been created, we are working on patch