From b4af7f4fb0b420eef4b249fcb3fb6739f5c8de32 Mon Sep 17 00:00:00 2001
From: David Byers <david.byers@liu.se>
Date: Thu, 11 Feb 2021 16:18:40 +0100
Subject: [PATCH] Adjust update-version for new branch structure.
---
scripts/update-version.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/update-version.py b/scripts/update-version.py
index c64c108..a201c34 100644
--- a/scripts/update-version.py
+++ b/scripts/update-version.py
@@ -229,8 +229,8 @@ def main():
increment = 0
# Check branch
- if commit_branch not in ('master', 'beta'):
- verbose(f'branch is not master or beta: not incrementing')
+ if commit_branch not in ('release', 'master'):
+ verbose(f'branch is not release or master: not incrementing')
increment = 0
# Don't do anything if already tagged and at max
@@ -248,9 +248,9 @@ def main():
pass
(major, minor, patch, build) = all_versions[0]
- if commit_branch == 'master':
+ if commit_branch == 'release':
new_version = str(Version([major, minor, patch + increment]))
- elif commit_branch == 'beta':
+ elif commit_branch == 'master':
new_version = str(Version([major, minor, patch, build + increment]))
else:
new_version = str(Version([major, minor, patch, build]))
--
GitLab