From 50c338982e4e113b71d8e6588df9f7c89017b17d Mon Sep 17 00:00:00 2001 From: jspijker Date: Mon, 27 Feb 2023 14:43:31 +0100 Subject: [PATCH] `prerelease` is deprecated in favor of `pre` Contribute to CURA-10317 --- .github/workflows/conan-recipe-version.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 6a3999b7ae..4a70e897bd 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -151,10 +151,10 @@ jobs: if commit == latest_branch_tag.commit: break no_commits += 1 - latest_branch_version_prerelease = latest_branch_version.prerelease - if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: + latest_branch_version_prerelease = latest_branch_version.pre + if latest_branch_version.pre and not "." in latest_branch_version.pre: # The prerealese did not contain a version number, default it to 1 - latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.1" + latest_branch_version_prerelease = f"{latest_branch_version.pre}.1" if event_name == "pull_request": actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version_prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}" channel_metadata = f"{channel}_{no_commits}" @@ -164,16 +164,16 @@ jobs: else: channel_metadata = f"{channel}_{no_commits}" if is_release_branch: - if latest_branch_version.prerelease == "" and branch_version > latest_branch_version: + if latest_branch_version.pre == "" 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 == "": + elif latest_branch_version.pre == "": # 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}" else: # An beta release has been created we are working toward a next beta or full release - bump_up_release_tag = int(latest_branch_version.prerelease.split('.')[1]) + 1 - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.split('.')[0]}.{bump_up_release_tag}+{buildmetadata}{channel_metadata}" + bump_up_release_tag = int(latest_branch_version.pre.split('.')[1]) + 1 + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.pre.split('.')[0]}.{bump_up_release_tag}+{buildmetadata}{channel_metadata}" else: max_branches_version = Version("0.0.0") branches_no_commits = no_commits