Revert "Don't return master as version"
This reverts commit 2d62e97e33.
This commit is contained in:
parent
22e3d8763f
commit
ea90deba96
1 changed files with 1 additions and 4 deletions
|
|
@ -237,10 +237,7 @@ def get_app_version():
|
||||||
Returns the version either from the env var, or from the version file.
|
Returns the version either from the env var, or from the version file.
|
||||||
"""
|
"""
|
||||||
version = get_env("SYNERGY_VERSION", required=False)
|
version = get_env("SYNERGY_VERSION", required=False)
|
||||||
|
if version:
|
||||||
# TODO: Perhaps regex match the version string and if it's not a valid version,
|
|
||||||
# log a warning and fall back to the VERSION file value.
|
|
||||||
if version and version != "master":
|
|
||||||
return version
|
return version
|
||||||
|
|
||||||
with open("VERSION", "r") as f:
|
with open("VERSION", "r") as f:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue