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

Fix brackets

Browse Source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-07-08 15:56:36 +02:00 committed by jspijker
parent 23234ea15f
commit 5f12f1f43b
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,11 +77,10 @@ jobs:
echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
echo '::set-output name=channel::stable' echo '::set-output name=channel::stable'
echo '::set-output name=version::${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}' echo '::set-output name=version::${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}'
elif [ "${{ github.event_name == 'pull_request' }} = "true" ]; then elif [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then
# Event triggered by a pull_request # Event triggered by a pull_request
echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
branch=${{ github.ref_name }} sanitized_branch=$(echo "${{ github.ref_name }}" | egrep -o "^[^/|_]+")
sanitized_branch=$(echo pr_$branch | egrep -o '^[^/]+')
echo '::set-output channel=$sanitized_branch' echo '::set-output channel=$sanitized_branch'
echo '::set-output version=${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}' echo '::set-output version=${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}'
else else
@ -90,8 +89,7 @@ jobs:
# we use the first 9 characters of the branch name # we use the first 9 characters of the branch name
# name/major.minor.patch-beta+build@ultimaker/cura_<jira_number> # name/major.minor.patch-beta+build@ultimaker/cura_<jira_number>
echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
branch=${{ github.ref_name }} sanitized_branch=$(echo "${{ github.ref_name }}" | egrep -o "^[^/|_]+")
sanitized_branch=$(echo $branch | egrep -o '^[^/|_]+')
echo '::set-output channel=$sanitized_branch' echo '::set-output channel=$sanitized_branch'
echo '::set-output version=${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}' echo '::set-output version=${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}'
fi fi