GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 12:05:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

use only semver pre-release-tags

Browse Source 
Contributes to CURA-9365
This commit is contained in:
j.spijker@ultimaker.com 2022-06-22 08:46:06 +02:00 committed by Jelle Spijker
parent 399bff8bf6
commit a80543aa4c
2 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.github/workflows/conan-recipe-version.yml vendored
View File

@ -26,9 +26,9 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: 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 }} 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 }} user: ${{ steps.get-conan-broadcast-data.outputs.user }}
channel: ${{ steps.get-conan-broadcast-data.outputs.channel }} channel: ${{ steps.get-conan-broadcast-data.outputs.channel }}
@ -48,31 +48,29 @@ jobs:
id: git-tool id: git-tool
uses: gittools/actions/gitversion/execute@v0.9.13 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 - id: get-conan-broadcast-data
name: Get Conan broadcast data name: Get Conan broadcast data
run: | run: |
if [ "${{ github.ref_name == 'main' }}" = "true" ]; then if [ "${{ github.ref_type == 'tag' }}" = "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
echo '::set-output name=user::_' echo '::set-output name=user::_'
echo '::set-output name=channel::_' 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 else
echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' 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 fi
- name: Get latest alias - name: Get latest alias

2
GitVersion.yml
View File

@ -16,7 +16,7 @@ branches:
develop: develop:
regex: ^CURA-.*$ regex: ^CURA-.*$
mode: ContinuousDelivery mode: ContinuousDelivery
tag: useBranchName tag: alpha
increment: None increment: None
prevent-increment-of-merged-branch-version: false prevent-increment-of-merged-branch-version: false
track-merge-target: true track-merge-target: true