diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-03 01:34:16 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-03 01:34:16 +0000 |
| commit | dcadf344719dcc0b0b09ae2cb97152ea67a3cec3 (patch) | |
| tree | 713f6ce186add9a4be8b200acb2b24de1ecf7a43 /rel/files/bin | |
| parent | a565dbde4f2262bf30ea2df50f08454f2edda900 (diff) | |
| parent | 8c7d7cc9365e996c624d4bdb6c8d578687ff117f (diff) | |
| download | pleroma-dcadf344719dcc0b0b09ae2cb97152ea67a3cec3.tar.gz | |
Merge branch '1048-semver-format-compliance' into 'develop'
Resolved violations of SemVer version format
Closes #1036 and #1048
See merge request pleroma/pleroma!1371
Diffstat (limited to 'rel/files/bin')
| -rwxr-xr-x | rel/files/bin/pleroma_ctl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rel/files/bin/pleroma_ctl b/rel/files/bin/pleroma_ctl index 9c67b209b..e731d20eb 100755 --- a/rel/files/bin/pleroma_ctl +++ b/rel/files/bin/pleroma_ctl @@ -30,12 +30,15 @@ detect_flavour() { detect_branch() { version="$(cut -d' ' -f2 <"$RELEASE_ROOT"/releases/start_erl.data)" - branch="$(echo "$version" | cut -d'-' -f 4)" + # Expected format: major.minor.patch_version(-number_of_commits_ahead_of_tag-gcommit_hash).branch + branch="$(echo "$version" | cut -d'.' -f 4)" if [ "$branch" = "develop" ]; then echo "develop" elif [ "$branch" = "" ]; then echo "master" else + # Note: branch name in version is of SemVer format and may only contain [0-9a-zA-Z-] symbols — + # if supporting releases for more branches, need to ensure they contain only these symbols. echo "Releases are built only for master and develop branches" >&2 exit 1 fi |