mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-23 14:44:13 -06:00
Fix release is pushed to branch and not tagged
This commit is contained in:
parent
95faab7eb9
commit
c98614e2e1
1 changed files with 19 additions and 24 deletions
43
.github/workflows/conan-recipe-version.yml
vendored
43
.github/workflows/conan-recipe-version.yml
vendored
|
@ -140,33 +140,28 @@ jobs:
|
||||||
if commit == latest_branch_tag.commit:
|
if commit == latest_branch_tag.commit:
|
||||||
break
|
break
|
||||||
no_commits += 1
|
no_commits += 1
|
||||||
|
latest_branch_version_prerelease = latest_branch_version.prerelease
|
||||||
if no_commits == 0:
|
if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease:
|
||||||
# This is a release on a branch
|
# The prerealese did not contain a version number, default it to 1
|
||||||
actual_version = f"{latest_branch_version}"
|
latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.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}"
|
||||||
else:
|
else:
|
||||||
latest_branch_version_prerelease = latest_branch_version.prerelease
|
if channel in ("stable", "_", ""):
|
||||||
if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease:
|
channel_metadata = f"{no_commits}"
|
||||||
# The prerealese did not contain a version number, default it to 1
|
else:
|
||||||
latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.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}"
|
channel_metadata = f"{channel}_{no_commits}"
|
||||||
|
if latest_branch_version.prerelease == "" or "beta" in latest_branch_version.prerelease:
|
||||||
|
if is_release_branch:
|
||||||
|
bump_up_patch = int(latest_branch_version.patch) + 1
|
||||||
|
actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}"
|
||||||
else:
|
else:
|
||||||
if channel in ("stable", "_", ""):
|
bump_up_minor = int(latest_branch_version.minor) + 1
|
||||||
channel_metadata = f"{no_commits}"
|
reset_patch = 0
|
||||||
else:
|
actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}"
|
||||||
channel_metadata = f"{channel}_{no_commits}"
|
else:
|
||||||
if latest_branch_version.prerelease == "" or "beta" in latest_branch_version.prerelease:
|
actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}"
|
||||||
if is_release_branch:
|
|
||||||
bump_up_patch = int(latest_branch_version.patch) + 1
|
|
||||||
actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}"
|
|
||||||
else:
|
|
||||||
bump_up_minor = int(latest_branch_version.minor) + 1
|
|
||||||
reset_patch = 0
|
|
||||||
actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}"
|
|
||||||
else:
|
|
||||||
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:
|
||||||
# FIXME: for external PR's
|
# FIXME: for external PR's
|
||||||
actual_version = f"5.3.0-alpha+{buildmetadata}pr_{issue_number}"
|
actual_version = f"5.3.0-alpha+{buildmetadata}pr_{issue_number}"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue