mirror of
https://github.com/dcs-liberation/dcs_liberation.git
synced 2025-11-10 14:22:26 +00:00
Fix pyinstaller spec for release.
final and buildnumber are optional files. Move them into resources to avoid naming them explicitly. (cherry picked from commit fae9650f56854bb3f3508ee5b2625bba8e7ad2f8)
This commit is contained in:
parent
4b40739918
commit
2891649531
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -44,7 +44,7 @@ jobs:
|
|||||||
|
|
||||||
- name: update build number
|
- name: update build number
|
||||||
run: |
|
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
|
- name: Build binaries
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@ -31,7 +31,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Finalize version
|
- name: Finalize version
|
||||||
run: |
|
run: |
|
||||||
New-Item -ItemType file final
|
New-Item -ItemType file resources\final
|
||||||
|
|
||||||
- name: mypy game
|
- name: mypy game
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@ -3,11 +3,12 @@ from pathlib import Path
|
|||||||
|
|
||||||
def _build_version_string() -> str:
|
def _build_version_string() -> str:
|
||||||
components = ["2.2.0"]
|
components = ["2.2.0"]
|
||||||
if Path("buildnumber").exists():
|
build_number_path = Path("resources/buildnumber")
|
||||||
with open("buildnumber", "r") as file:
|
if build_number_path.exists():
|
||||||
components.append(file.readline())
|
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")
|
components.append("preview")
|
||||||
|
|
||||||
return "-".join(components)
|
return "-".join(components)
|
||||||
|
|||||||
@ -11,7 +11,6 @@ analysis = Analysis(
|
|||||||
('resources', 'resources'),
|
('resources', 'resources'),
|
||||||
('resources/caucasus.p', 'dcs/terrain/'),
|
('resources/caucasus.p', 'dcs/terrain/'),
|
||||||
('resources/nevada.p', 'dcs/terrain/'),
|
('resources/nevada.p', 'dcs/terrain/'),
|
||||||
('buildnumber', './')
|
|
||||||
],
|
],
|
||||||
hookspath=[],
|
hookspath=[],
|
||||||
runtime_hooks=[],
|
runtime_hooks=[],
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user