diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-08-05 14:21:22 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-08-05 14:21:22 +0200 |
| commit | 90759a092e85517f80c8937b4a40f0493123c501 (patch) | |
| tree | b63ac9d7cbeac5d70c483142771486d9767ae507 | |
| parent | e81b7d5b25cd57fa8c8c9cc085703b68932eee3d (diff) | |
| download | vyos-build-90759a092e85517f80c8937b4a40f0493123c501.tar.gz vyos-build-90759a092e85517f80c8937b4a40f0493123c501.zip | |
T1562: change version scheme on current branch used for rolling releases
| -rw-r--r-- | data/versions | 2 | ||||
| -rwxr-xr-x | scripts/make-version-file | 2 |
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) |