Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-10-06 09:17:07 +02:00
Code Issues Projects Releases Activity

Fix to only zip installer if we have one

Browse Source
This commit is contained in:
Elias Steurer 2022-08-07 18:20:16 +02:00
parent 8ca09c684d
commit 472e341440
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -39,7 +39,7 @@ build:windows_release:
- python setup.py
- python build.py -type release -use-aqt -installer
artifacts:
expire_in: "4 weeks"
expire_in: "never"
paths:
- build-x64-windows-release/bin/
- build-x64-windows-release/ScreenPlay-Installer.exe
@ -57,7 +57,7 @@ build:windows_release_steam:
- python setup.py
- python build.py -type release -steam -use-aqt
artifacts:
expire_in: "4 weeks"
expire_in: "never"
paths:
- build-x64-windows-release/bin/
@ -75,7 +75,7 @@ build:osx_release:
- python3 build.py -type release -use-aqt -installer -architecture x64
- python3 build.py -type release -use-aqt -installer -architecture arm64
artifacts:
expire_in: "4 weeks"
expire_in: "never"
paths:
- build-x64-osx-release/bin/
- build-arm-osx-release/bin/
@ -96,7 +96,7 @@ build:osx_release_steam:
- python3 build.py -type release -steam -use-aqt -architecture x64
- python3 build.py -type release -steam -use-aqt -architecture arm64
artifacts:
expire_in: "4 weeks"
expire_in: "never"
paths:
- build-x64-osx-release/bin/
- build-arm-osx-release/bin/
@ -125,7 +125,7 @@ build:linux_release:
- python3 setup.py
- python3 build.py -type release -steam -use-aqt -installer
artifacts:
expire_in: "4 weeks"
expire_in: "never"
paths:
- build-x64-linux-release/bin/
@ -286,7 +286,7 @@ test:windows_release:
script:
- ./build-x64-windows-release/bin/ScreenPlay.exe --no-run=false --exit=true --reporters=junit --out=test-report-junit.xml
artifacts:
expire_in: "4 weeks"
expire_in: "never"
when: always
reports:
junit: test-report-junit.xml

8
Tools/build.py
View File

@ -439,10 +439,10 @@ def zip(build_config: BuildConfig, build_result: BuildResult) -> BuildResult:
# Some weird company firewalls do not allow direct .exe downloads
# lets just zip the installer lol
build_result.installer_zip = Path(build_result.build).joinpath(build_result.installer.stem + ".zip")
print(f"Create zip from installer: {build_result.installer_zip}")
zipfile.ZipFile(build_result.installer_zip, 'w').write(build_result.installer, build_result.build)
if build_config.create_installer == "ON":
build_result.installer_zip = Path(build_result.build).joinpath(build_result.installer.stem + ".zip")
print(f"Create zip from installer: {build_result.installer_zip}")
zipfile.ZipFile(build_result.installer_zip, 'w').write(build_result.installer, build_result.build)
return build_result