From 2244b50c6e0c4af962029043abbea082b0c11738 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Mon, 12 Sep 2022 09:09:14 +0200 Subject: [PATCH] fix latest branch version prerelease --- .github/workflows/conan-recipe-version.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index cd5b1f48c1..9320f4e980 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -147,11 +147,12 @@ jobs: user = "_" channel = "_" else: + latest_branch_version_prerelease = 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 - latest_branch_version.prerelease += ".1" + 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}" + 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: if channel in ("stable", "_", ""): channel_metadata = f"{no_commits}"