GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-25 07:39:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2022-09-06 16:20:55 +02:00
commit f3b742d26a
No known key found for this signature in database
GPG Key ID: C85F7A3AF1BAA7C4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,8 +157,8 @@ jobs:
channel_metadata = f"{channel}_{no_commits}" channel_metadata = f"{channel}_{no_commits}"
# FIXME: for when we create a new release branch # FIXME: for when we create a new release branch
if latest_branch_version.prerelease == "": if latest_branch_version.prerelease == "":
bump_up_minor = int(latest_branch_version.minor) + 1 bump_up_patch = int(latest_branch_version.patch) + 1
actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{latest_branch_version.patch}-alpha+{buildmetadata}{channel_metadata}" actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}"
else: else:
actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}"
else: else: