From 4b407399182b1889d72a590baafff0d80625348c Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Sat, 14 Nov 2020 12:37:22 -0800 Subject: [PATCH] Fix versioning for release builds. (cherry picked from commit 9019cbfd2b715c35da10ad7ed79d44ab81e57052) --- .github/workflows/release.yml | 4 ++++ game/version.py | 17 +++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 21806ed4..5580f694 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,6 +29,10 @@ jobs: # For some reason the shiboken2.abi3.dll is not found properly, so I copy it instead Copy-Item .\venv\Lib\site-packages\shiboken2\shiboken2.abi3.dll .\venv\Lib\site-packages\PySide2\ -Force + - name: Finalize version + run: | + New-Item -ItemType file final + - name: mypy game run: | ./venv/scripts/activate diff --git a/game/version.py b/game/version.py index b9b97187..bdcbdded 100644 --- a/game/version.py +++ b/game/version.py @@ -1,8 +1,17 @@ from pathlib import Path +def _build_version_string() -> str: + components = ["2.2.0"] + if Path("buildnumber").exists(): + with open("buildnumber", "r") as file: + components.append(file.readline()) + + if not Path("final").exists(): + components.append("preview") + + return "-".join(components) + + #: Current version of Liberation. -VERSION = "2.2.0" -if Path("buildnumber").exists(): - with open("buildnumber", "r") as file: - VERSION += f"-{file.readline()}" +VERSION = _build_version_string()