summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/versions2
-rwxr-xr-xscripts/make-version-file2
2 files changed, 2 insertions, 2 deletions
diff --git a/data/versions b/data/versions
index 3d0c2871..4fbf63f2 100644
--- a/data/versions
+++ b/data/versions
@@ -1,3 +1,3 @@
{
- "current": "1.2.0"
+ "current": "1.2"
}
diff --git a/scripts/make-version-file b/scripts/make-version-file
index 4df2cb6c..fa632eed 100755
--- a/scripts/make-version-file
+++ b/scripts/make-version-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)