From 23234ea15f96228c96b154ed686e1f1da4eddaf2 Mon Sep 17 00:00:00 2001
From: "j.spijker@ultimaker.com" <jelle spijker>
Date: Fri, 8 Jul 2022 15:48:34 +0200
Subject: [PATCH] Fix for short branch names

Contributes to CURA-9365
---
 .github/workflows/conan-recipe-version.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml
index 2238fef406..d81711bc9b 100644
--- a/.github/workflows/conan-recipe-version.yml
+++ b/.github/workflows/conan-recipe-version.yml
@@ -77,7 +77,7 @@ jobs:
                       echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
                       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 }}'
-                    elif [ "${{ github.event_name == 'pull_request' }} ]; then
+                    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)}'
                       branch=${{ github.ref_name }}
@@ -91,8 +91,8 @@ jobs:
                       # name/major.minor.patch-beta+build@ultimaker/cura_<jira_number>
                       echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
                       branch=${{ github.ref_name }}
-                      sanitized_branch="${branch//-/_}"
-                      echo $sanitized_branch | awk '{print "::set-output name=channel::"substr(tolower($0),0,9)}'
+                      sanitized_branch=$(echo $branch | egrep -o '^[^/|_]+')
+                      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 }}'
                     fi