Browse Source

Simplified set-output for channel

Contributes to CURA-9365
j.spijker@ultimaker.com 2 years ago
parent
commit
0a1452dccb
1 changed files with 2 additions and 4 deletions
  1. 2 4
      .github/workflows/conan-recipe-version.yml

+ 2 - 4
.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_<jira_number>
                       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