Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00
Code Issues Projects Releases Activity

Disable ffmpeg downloading if we're in the shared GitLab CI

Browse Source 
It freeze randomly and we don't have control over it so idk
This commit is contained in:
tretrauit 2022-01-04 21:13:39 +07:00
parent 6785199e15
commit 5eddac7c83
No known key found for this signature in database
GPG Key ID: 862760FF1903319E
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -45,7 +45,7 @@ build:shared_windows_release:
- aqt install-qt -O ../aqt windows desktop $QT_VERSION win64_msvc2019_64 -m all - aqt install-qt -O ../aqt windows desktop $QT_VERSION win64_msvc2019_64 -m all
- aqt install-tool -O ../aqt windows desktop tools_ifw - aqt install-tool -O ../aqt windows desktop tools_ifw
- cd Tools - cd Tools
- python setup.py - python setup.py --windows-shared-gitlab-ci
- python build.py -type release -use-aqt -installer - python build.py -type release -use-aqt -installer
artifacts: artifacts:
expire_in: "4 weeks" expire_in: "4 weeks"

8
Tools/setup.py
View File

@ -52,6 +52,8 @@ if __name__ == "__main__":
parser.add_argument( parser.add_argument(
'--path', help='Manually set the vcpkg path. The path must be an absolute path \ '--path', help='Manually set the vcpkg path. The path must be an absolute path \
without the ScreenPlay-vcpkg folder (E.g. py .\setup.py --path "D:/Backup/Code/Qt/")') without the ScreenPlay-vcpkg folder (E.g. py .\setup.py --path "D:/Backup/Code/Qt/")')
parser.add_argument('--windows-shared-gitlab-ci', action='store_true',
help="Perform fixes for shared GitLab runner, you normally don't need to use this.")
args = parser.parse_args() args = parser.parse_args()
# ScreenPlay source and ScreenPlay-vcpkg have to be on the same file system hierarchy # ScreenPlay source and ScreenPlay-vcpkg have to be on the same file system hierarchy
@ -80,9 +82,9 @@ without the ScreenPlay-vcpkg folder (E.g. py .\setup.py --path "D:/Backup/Code/Q
if system() == "Windows": if system() == "Windows":
vcpkg_command = "vcpkg.exe" vcpkg_command = "vcpkg.exe"
vcpkg_packages_list.append("infoware[d3d]") vcpkg_packages_list.append("infoware[d3d]")
if shutil.which("pwsh"): if shutil.which("pwsh") and args.windows_shared_gitlab_ci:
print("Using experimental pwsh, may not work properly.") print("Using experimental pwsh for GitLab CI, may not work properly.")
platform_command.add("pwsh.exe -NoProfile -ExecutionPolicy Bypass .\scripts\\bootstrap.ps1", vcpkg_path) platform_command.add("pwsh.exe -NoProfile -ExecutionPolicy Bypass .\\scripts\\bootstrap.ps1", vcpkg_path)
else: else:
platform_command.add("bootstrap-vcpkg.bat", vcpkg_path, False) platform_command.add("bootstrap-vcpkg.bat", vcpkg_path, False)
platform_command.add("download_ffmpeg.bat", project_source_path.joinpath("Tools"), False) platform_command.add("download_ffmpeg.bat", project_source_path.joinpath("Tools"), False)