Skip to content
Snippets Groups Projects
Commit b4af7f4f authored by David Byers's avatar David Byers
Browse files

Adjust update-version for new branch structure.

parent 620fcb33
No related branches found
No related tags found
1 merge request!9Master
Pipeline #33552 passed
......@@ -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]))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment