From a80543aa4c69af37d1498a0124f1b06b0e0552f5 Mon Sep 17 00:00:00 2001
From: "j.spijker@ultimaker.com" <jelle spijker>
Date: Wed, 22 Jun 2022 08:46:06 +0200
Subject: [PATCH] use only semver pre-release-tags

Contributes to CURA-9365
---
 .github/workflows/conan-recipe-version.yml | 40 ++++++------
 GitVersion.yml                             | 76 +++++++++++-----------
 2 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml
index 8665d28c09..9cc322fe55 100644
--- a/.github/workflows/conan-recipe-version.yml
+++ b/.github/workflows/conan-recipe-version.yml
@@ -26,9 +26,9 @@ jobs:
         runs-on: ubuntu-latest
 
         outputs:
-            recipe_id_full: ${{ inputs.project_name }}/${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.prereleasetag.outputs.PreReleaseTag }}+${{ steps.git-tool.outputs.BuildMetaData }}@${{ steps.get-conan-broadcast-data.outputs.user }}/${{ steps.get-conan-broadcast-data.outputs.channel }}
+            recipe_id_full: ${{ inputs.project_name }}/${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseTag }}+${{ steps.git-tool.outputs.BuildMetaData }}@${{ steps.get-conan-broadcast-data.outputs.user }}/${{ steps.get-conan-broadcast-data.outputs.channel }}
             recipe_id_latest: ${{ steps.latest-alias.outputs.recipe_id_latest }}
-            semver_full: ${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.prereleasetag.outputs.PreReleaseTag }}+${{ steps.git-tool.outputs.BuildMetaData }}
+            semver_full: ${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ ssteps.git-tool.outputs.PreReleaseTag }}+${{ steps.git-tool.outputs.BuildMetaData }}
             user: ${{ steps.get-conan-broadcast-data.outputs.user }}
             channel: ${{ steps.get-conan-broadcast-data.outputs.channel }}
 
@@ -48,31 +48,29 @@ jobs:
                 id: git-tool
                 uses: gittools/actions/gitversion/execute@v0.9.13
 
-            -   name: Get short PreReleaseTag
-                id: prereleasetag
-                run: |
-                    long_pre_release_tag=${{ steps.git-tool.outputs.PreReleaseTag }}
-                    sanitized_pre_release_tag="${long_pre_release_tag//-/_}"
-                    if [ "${{ github.event_name == 'merge' }}" = "true" ]; then
-                        echo $sanitized_pre_release_tag | awk '{print "::set-output name=PreReleaseTag::m_"substr(tolower($0),5,9)}'
-                    elif [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then
-                        echo $sanitized_pre_release_tag | awk '{print "::set-output name=PreReleaseTag::pr_"substr(tolower($0),12,21)}'
-                    else
-                        echo $sanitized_pre_release_tag | awk '{print "::set-output name=PreReleaseTag::"substr(tolower($0),0,9)}'
-                    fi
-
             -   id: get-conan-broadcast-data
                 name: Get Conan broadcast data
-                run: |                   
-                    if [ "${{ github.ref_name == 'main' }}" = "true" ]; then
-                      echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
-                      echo '::set-output name=channel::stable'
-                    elif [ "${{ steps.git-tool.outputs.fullSemVer == steps.git-tool.outputs.MajorMinorPatch }}" = "true" ]; then
+                run: |
+                    if [ "${{ github.ref_type == 'tag' }}" = "true" ]; then
                       echo '::set-output name=user::_'
                       echo '::set-output name=channel::_'
+                    elif [ "${{ github.ref_name == 'main' || github.ref_name == '5.1' }}" = "true" ]; then
+                      # FIXME: For release branches
+                      echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
+                      echo '::set-output name=channel::stable'
                     else
                       echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}'
-                      echo '::set-output name=channel::testing'
+                    
+                      branch=${{ github.ref_name }}
+                      sanitized_branch="${branch//-/_}"
+                    
+                      if [ "${{ github.event_name == 'merge' }}" = "true" ]; then
+                            echo $sanitized_branch | awk '{print "::set-output name=channel::m_"substr(tolower($0),0,9)}'
+                      elif [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then
+                            echo $sanitized_branch | awk '{print "::set-output name=channel::pr_"substr(tolower($0),0,9)}'
+                      else
+                        echo $sanitized_branch | awk '{print "::set-output name=channel::"substr(tolower($0),0,9)}'
+                      fi
                     fi
 
             -   name: Get latest alias
diff --git a/GitVersion.yml b/GitVersion.yml
index 64e50bdf7b..b46d102dcf 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -1,42 +1,42 @@
 mode: ContinuousDelivery
 next-version: 5.1
 branches:
-  main:
-    regex: ^main$
-    mode: ContinuousDelivery
-    tag: alpha
-    increment: None
-    prevent-increment-of-merged-branch-version: true
-    track-merge-target: false
-    source-branches: [  ]
-    tracks-release-branches: false
-    is-release-branch: false
-    is-mainline: true
-    pre-release-weight: 55000
-  develop:
-    regex: ^CURA-.*$
-    mode: ContinuousDelivery
-    tag: useBranchName
-    increment: None
-    prevent-increment-of-merged-branch-version: false
-    track-merge-target: true
-    source-branches: [ 'main' ]
-    tracks-release-branches: true
-    is-release-branch: false
-    is-mainline: false
-    pre-release-weight: 0
-  release:
-    regex: ^[\d].[\d]$
-    mode: ContinuousDelivery
-    tag: beta
-    increment: None
-    prevent-increment-of-merged-branch-version: true
-    track-merge-target: false
-    source-branches: [ 'main' ]
-    tracks-release-branches: false
-    is-release-branch: true
-    is-mainline: false
-    pre-release-weight: 30000
+    main:
+        regex: ^main$
+        mode: ContinuousDelivery
+        tag: alpha
+        increment: None
+        prevent-increment-of-merged-branch-version: true
+        track-merge-target: false
+        source-branches: [ ]
+        tracks-release-branches: false
+        is-release-branch: false
+        is-mainline: true
+        pre-release-weight: 55000
+    develop:
+        regex: ^CURA-.*$
+        mode: ContinuousDelivery
+        tag: alpha
+        increment: None
+        prevent-increment-of-merged-branch-version: false
+        track-merge-target: true
+        source-branches: [ 'main' ]
+        tracks-release-branches: true
+        is-release-branch: false
+        is-mainline: false
+        pre-release-weight: 0
+    release:
+        regex: ^[\d].[\d]$
+        mode: ContinuousDelivery
+        tag: beta
+        increment: None
+        prevent-increment-of-merged-branch-version: true
+        track-merge-target: false
+        source-branches: [ 'main' ]
+        tracks-release-branches: false
+        is-release-branch: true
+        is-mainline: false
+        pre-release-weight: 30000
 ignore:
-  sha: []
-merge-message-formats: {}
+    sha: [ ]
+merge-message-formats: { }