diff --git a/.forgejo/actions/version/action.yml b/.forgejo/actions/version/action.yml index 2ddc710..efdbe35 100644 --- a/.forgejo/actions/version/action.yml +++ b/.forgejo/actions/version/action.yml @@ -151,7 +151,7 @@ runs: pr_bump=$(calculate_bump "$pr_commits") base_bump=$(calculate_bump "$(commits_between "$tag_start" "$base_commit")" 0) bump=$(higher_bump "$base_bump" "$pr_bump") - version=$(bump_version "$base_version" "$bump")-pr."$pr_number".sha."$head_commit" + version=$(bump_version "$base_version" "$bump")-pr."$pr_number"+sha."$head_commit" label="pr.$pr_number" metadata="sha.$head_commit" elif [[ "$event_name" == push && "$ref_name" == [0-9]* || "$ref_name" == [0-9]* ]]; then @@ -163,7 +163,7 @@ runs: head_commit=$(git rev-parse "$head_sha") commits=$(commits_between "$tag_start" "$head_commit") bump=$(calculate_bump "$commits") - version=$(bump_version "$base_version" "$bump")-next.sha."$head_commit" + version=$(bump_version "$base_version" "$bump")-next+sha."$head_commit" label=next metadata="sha.$head_commit" fi diff --git a/doc/versioning.md b/doc/versioning.md index 6f01a93..290f6d3 100644 --- a/doc/versioning.md +++ b/doc/versioning.md @@ -58,6 +58,8 @@ Builds that are not releases carry metadata identifying their source: - **Main branch:** `sha.` The main branch is labelled `next` for the upcoming release. +The resulting versions use SemVer build metadata, for example: +`0.0.0-next+sha.`. ## Releases