From 5f12f1f43b182d6c624cd112f8192f9450de8118 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 8 Jul 2022 15:56:36 +0200 Subject: [PATCH] Fix brackets Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index d81711bc9b..c51f07ec80 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -77,11 +77,10 @@ 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' }} = "true" ]; 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 }} - sanitized_branch=$(echo pr_$branch | egrep -o '^[^/]+') + sanitized_branch=$(echo "${{ github.ref_name }}" | 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 }}' else @@ -90,8 +89,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)}' - branch=${{ github.ref_name }} - sanitized_branch=$(echo $branch | egrep -o '^[^/|_]+') + sanitized_branch=$(echo "${{ github.ref_name }}" | 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