GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 01:15:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add major_minor output for easier release branch detection

Browse Source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-15 08:34:30 +02:00 committed by Jelle Spijker
parent 12eb5f15d1
commit 2b808daa4e
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,6 +20,10 @@ on:
description: "The full semver <Major>.<Minor>.<Patch>-<PreReleaseTag>+<BuildMetaData>" description: "The full semver <Major>.<Minor>.<Patch>-<PreReleaseTag>+<BuildMetaData>"
value: ${{ jobs.get-semver.outputs.semver_full }} value: ${{ jobs.get-semver.outputs.semver_full }}
major_minor:
description: "The release branch name <Major>.<Minor>"
value: ${{ jobs.get-semver.outputs.major_minor }}
recipe_user: recipe_user:
description: "The conan user" description: "The conan user"
value: ${{ jobs.get-semver.outputs.user }} value: ${{ jobs.get-semver.outputs.user }}
@ -37,6 +41,7 @@ jobs:
recipe_id_full: ${{ steps.get-conan-broadcast-data.outputs.recipe_id_full }} recipe_id_full: ${{ steps.get-conan-broadcast-data.outputs.recipe_id_full }}
recipe_id_latest: ${{ steps.get-conan-broadcast-data.outputs.recipe_id_latest }} recipe_id_latest: ${{ steps.get-conan-broadcast-data.outputs.recipe_id_latest }}
semver_full: ${{ steps.get-conan-broadcast-data.outputs.semver_full }} semver_full: ${{ steps.get-conan-broadcast-data.outputs.semver_full }}
major_minor: ${{ steps.get-conan-broadcast-data.outputs.major_minor }}
user: ${{ steps.get-conan-broadcast-data.outputs.user }} user: ${{ steps.get-conan-broadcast-data.outputs.user }}
channel: ${{ steps.get-conan-broadcast-data.outputs.channel }} channel: ${{ steps.get-conan-broadcast-data.outputs.channel }}
@ -127,6 +132,8 @@ jobs:
else: else:
actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{no_commits}" actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{no_commits}"
major_minor = f"{latest_branch_version.major}.{latest_branch_version.minor}"
# %% print to output # %% print to output
cmd_name = ["echo", f"::set-output name=name::{project_name}"] cmd_name = ["echo", f"::set-output name=name::{project_name}"]
subprocess.call(cmd_name) subprocess.call(cmd_name)
@ -140,6 +147,8 @@ jobs:
subprocess.call(cmd_id_latest) subprocess.call(cmd_id_latest)
cmd_semver_full = ["echo", f"::set-output name=semver_full::{actual_version}"] cmd_semver_full = ["echo", f"::set-output name=semver_full::{actual_version}"]
subprocess.call(cmd_semver_full) subprocess.call(cmd_semver_full)
cmd_major_minor = ["echo", f"::set-output name=major_minor::{major_minor}"]
subprocess.call(cmd_major_minor)
print("::group::Conan Recipe Information") print("::group::Conan Recipe Information")
print(f"name = {project_name}") print(f"name = {project_name}")
@ -149,5 +158,6 @@ jobs:
print(f"recipe_id_full = {project_name}/{actual_version}@{user}/{channel}") print(f"recipe_id_full = {project_name}/{actual_version}@{user}/{channel}")
print(f"recipe_id_latest = {project_name}/latest@{user}/{channel}") print(f"recipe_id_latest = {project_name}/latest@{user}/{channel}")
print(f"semver_full = {actual_version}") print(f"semver_full = {actual_version}")
print(f"major_minor = {major_minor}")
print("::endgroup::") print("::endgroup::")
shell: python shell: python