diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 71d5cf3c..60cbf719 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: - name: update build number run: | - [IO.File]::WriteAllLines($pwd.path + "\buildnumber", $env:GITHUB_RUN_NUMBER) + [IO.File]::WriteAllLines($pwd.path + "\resources\buildnumber", $env:GITHUB_RUN_NUMBER) - name: Build binaries run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5580f694..ca8a238e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,7 +31,7 @@ jobs: - name: Finalize version run: | - New-Item -ItemType file final + New-Item -ItemType file resources\final - name: mypy game run: | diff --git a/game/version.py b/game/version.py index bdcbdded..f3b1d1f4 100644 --- a/game/version.py +++ b/game/version.py @@ -3,11 +3,12 @@ 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()) + build_number_path = Path("resources/buildnumber") + if build_number_path.exists(): + with build_number_path.open("r") as build_number_file: + components.append(build_number_file.readline()) - if not Path("final").exists(): + if not Path("resources/final").exists(): components.append("preview") return "-".join(components) diff --git a/pyinstaller.spec b/pyinstaller.spec index e545d073..839c641f 100644 --- a/pyinstaller.spec +++ b/pyinstaller.spec @@ -11,7 +11,6 @@ analysis = Analysis( ('resources', 'resources'), ('resources/caucasus.p', 'dcs/terrain/'), ('resources/nevada.p', 'dcs/terrain/'), - ('buildnumber', './') ], hookspath=[], runtime_hooks=[],