Browse Source

don't use prereleasenumber

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

+ 4 - 4
.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.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_full: ${{ inputs.project_name }}/${{ 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 }}@${{ 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.git-tool.outputs.PreReleaseTag }}+${{ steps.git-tool.outputs.BuildMetaData }}
+            semver_full: ${{ 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 }}
             user: ${{ steps.get-conan-broadcast-data.outputs.user }}
             channel: ${{ steps.get-conan-broadcast-data.outputs.channel }}
 
@@ -65,9 +65,9 @@ jobs:
                       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)}'
+                            echo $sanitized_branch | awk '{print "::set-output name=channel::m_"substr(tolower($0),0,5)}'
                       elif [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then
-                            echo $sanitized_branch | awk '{print "::set-output name=channel::pr_"substr(tolower($0),0,9)}'
+                            echo $sanitized_branch | awk '{print "::set-output name=channel::pr_"substr(tolower($0),0,5)}'
                       else
                         echo $sanitized_branch | awk '{print "::set-output name=channel::"substr(tolower($0),0,9)}'
                       fi

+ 5 - 5
conandata.yml

@@ -228,11 +228,11 @@
             Linux: "./icons/cura-128.png"
 "5.1.0-alpha":
     requirements:
-        - "arcus/[5.1.0-alpha.1]@ultimaker/cura_9365"
-        - "curaengine/[5.1.0-alpha.1]@ultimaker/cura_9365"
-        - "savitar/[5.1.0-alpha.1]@ultimaker/cura_9365"
-        - "pynest2d/[5.1.0-alpha.1]@ultimaker/cura_9365"
-        - "uranium/[5.1.0-alpha.1]@ultimaker/cura_9365"
+        - "arcus/[5.1.0-alpha]@ultimaker/cura_9365"
+        - "curaengine/[5.1.0-alpha]@ultimaker/cura_9365"
+        - "savitar/[5.1.0-alpha]@ultimaker/cura_9365"
+        - "pynest2d/[5.1.0-alpha]@ultimaker/cura_9365"
+        - "uranium/[5.1.0-alpha]@ultimaker/cura_9365"
         - "fdm_materials/5.1.0-beta+12@ultimaker/stable"
         - "cura_binary_data/5.1.0-alpha.1+25@ultimaker/stable"
         - "cpython/3.10.4"