T1562: change version scheme on current branch used for rolling releases

This commit is contained in:
Christian Poessinger 2019-08-05 14:21:22 +02:00
parent e81b7d5b25
commit 90759a092e
2 changed files with 2 additions and 2 deletions

View File

@ -1,3 +1,3 @@
{
"current": "1.2.0"
"current": "1.2"
}

View File

@ -64,7 +64,7 @@ if build_config['build_type'] == 'development':
git_branch = repo.active_branch.name
branch_version = version_mapping[git_branch]
version = "{0}-rolling+{1}".format(branch_version, build_timestamp)
version = "{0}-rolling-{1}".format(branch_version, build_timestamp)
except Exception as e:
print("Could not build a version string specific to git branch, falling back to default: {0}".format(str(e)))
version = "999.{0}".format(build_timestamp)