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

fix latest branch version prerelease

Browse Source
This commit is contained in:
j.spijker@ultimaker.com 2022-09-12 09:09:14 +02:00 committed by jspijker
parent 6d8ac37766
commit 2244b50c6e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,11 +147,12 @@ jobs:
user = "_" user = "_"
channel = "_" channel = "_"
else: else:
latest_branch_version_prerelease = latest_branch_version.prerelease
if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease:
# The prerealese did not contain a version number, default it to 1 # The prerealese did not contain a version number, default it to 1
latest_branch_version.prerelease += ".1" latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.1"
if event_name == "pull_request": 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}" 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}"
else: else:
if channel in ("stable", "_", ""): if channel in ("stable", "_", ""):
channel_metadata = f"{no_commits}" channel_metadata = f"{no_commits}"