3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

take new minor release branches into account

Browse source
This commit is contained in:
jspijker 2023-01-31 13:30:31 +01:00
parent b8c9fa3f51
commit aa2cb76135
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/conan-recipe-version.yml vendored
View file

@ -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}"