3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-01-05 22:27:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '5.2'

Browse source 
# Conflicts:
#	conanfile.py
This commit is contained in:
Jelle Spijker 2022-10-10 10:23:01 +02:00
commit 48ea4cee9f
18 changed files with 681 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/conan-package.yml vendored
View file

@ -44,8 +44,9 @@ on:
- '[1-9].[0-9]'
- '[1-9].[0-9][0-9]'
tags:
- '[1-9].[0-9].[0-9]+'
- '[1-9].[0-9][0-9].[0-9]+'
- '[1-9].[0-9].[0-9]*'
- '[1-9].[0-9].[0-9]'
- '[1-9].[0-9][0-9].[0-9]*'
permissions: {}
jobs:

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

@ -169,6 +169,14 @@ jobs:
# FIXME: for external PR's
actual_version = f"5.3.0-alpha+{buildmetadata}pr_{issue_number}"
if is_tag:
print("THE TAG IS: ", ${{ github.ref_name }})
if is_tag and ${{ github.ref_name }} == "5.2.0-beta:
actual_version = "5.2.0-beta"
is_release_branch = True
user = "_"
channel = "_"
# %% print to output
cmd_name = ["echo", f"::set-output name=name::{project_name}"]
subprocess.call(cmd_name)
@ -190,7 +198,7 @@ jobs:
print(f"version = {actual_version}")
print(f"user = {user}")
print(f"channel = {channel}")
print(f"recipe_id_full = {project_name}/{actual_version}@{user}/{channel}")
print(f"= {project_name}/{actual_version}@{user}/{channel}")
print(f"recipe_id_latest = {project_name}/latest@{user}/{channel}")
print(f"semver_full = {actual_version}")
print(f"is_release_branch = {str(is_release_branch).lower()}")