From 0a1452dccb1f0ec54dd2d35c6d084f7e6c2f8184 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 8 Jul 2022 16:11:47 +0200 Subject: [PATCH] Simplified set-output for channel Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index bdbcee77e1..326dde4743 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -80,8 +80,7 @@ jobs: elif [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then # Event triggered by a pull_request echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' - sanitized_branch=$(echo "pr_${{ github.ref_name }}" | egrep -o "^[^/|_]+") - echo '::set-output channel=$sanitized_branch' + echo '::set-output channel=pr_${{ github.ref_name }}' | egrep -o '^[^/|_]+' 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 # commits on other branches are considered unstable and for development purposes only @@ -89,8 +88,7 @@ jobs: # we use the first 9 characters of the branch name # name/major.minor.patch-beta+build@ultimaker/cura_ echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' - sanitized_branch=$(echo "${{ github.ref_name }}" | egrep -o "^[^/|_]+") - echo '::set-output channel=$sanitized_branch' + echo '::set-output channel=${{ github.ref_name }}' | egrep -o '^[^/|_]+' 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