infrastructure/blender-devops
infrastructure/blender-devops
1
1
Fork 7
Code Pull Requests 5 Activity

Fix: Use proper entitlements for thumbnailer #10

Open
Sergey Sharybin wants to merge 2 commits from appex_entitlements into main
pull from: appex_entitlements
merge into: infrastructure:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 2 Files Changed 3 +6 -4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c27e55efa5 - Show all commits

4
buildbot/worker/blender/compile.py
View File

@ -151,8 +151,8 @@ def get_cmake_options(builder: worker.blender.CodeBuilder) -> worker.utils.CmdSe
linker_file_path="C:/Program Files/LLVM/bin/lld-link.exe" linker_file_path="C:/Program Files/LLVM/bin/lld-link.exe"
else: else:
vs_tool_install_dir_suffix = "bin/Hostx64/x64" vs_tool_install_dir_suffix = "bin/Hostx64/x64"
compiler_file_path = vc_tool_install_path / f"{vs_tool_install_dir_suffix}/cl.exe" compiler_file_path = str(vc_tool_install_path / f"{vs_tool_install_dir_suffix}/cl.exe")
linker_file_path = vc_tool_install_path / f"{vs_tool_install_dir_suffix}/link.exe" linker_file_path = str(vc_tool_install_path / f"{vs_tool_install_dir_suffix}/link.exe")
options += ["-G", "Ninja"] options += ["-G", "Ninja"]
# -DWITH_WINDOWS_SCCACHE=On # -DWITH_WINDOWS_SCCACHE=On

6
buildbot/worker/blender/sign.py
View File

@ -32,14 +32,16 @@ def sign_windows_files(
worker.utils.warning("Performing dry run on LOCAL service environment") worker.utils.warning("Performing dry run on LOCAL service environment")
dry_run = True dry_run = True
cmd: worker.utils.CmdSequence = [ cmd_args = [
sys.executable, sys.executable,
"C:\\tools\\codesign.py", "C:\\tools\\codesign.py",
"--server-url", "--server-url",
worker.utils.HiddenArgument(server_url), worker.utils.HiddenArgument(server_url),
] ]
if description: if description:
cmd += ["--description", description] cmd_args += ["--description", description]
cmd: worker.utils.CmdSequence = cmd_args
# Signing one file at a time causes a stampede on servers, resulting in blocking. # Signing one file at a time causes a stampede on servers, resulting in blocking.
# Instead sign in chunks of multiple files. # Instead sign in chunks of multiple files.