infrastructure/blender-devops
infrastructure/blender-devops
1
1
Fork 8
Code Pull Requests 3 Activity

User Manual: Remove old files for when deploying #7

Merged
Bart van der Braak merged 4 commits from Blendify/blender-devops:manual-doc-rsync-delete into main 2024-10-04 10:56:45 +02:00
Conversation 4 Commits 4 Files Changed 1 +8 -4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a161b1a527 - Show all commits

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

@ -146,12 +146,13 @@ def get_cmake_options(builder: worker.blender.CodeBuilder) -> worker.utils.CmdSe
vc_tool_install_path = pathlib.PureWindowsPath(vc_tools_install_dir) vc_tool_install_path = pathlib.PureWindowsPath(vc_tools_install_dir)
if builder.architecture == "arm64": if builder.architecture == "arm64":
vs_tool_install_dir_suffix = "bin/Hostarm64/arm64" compiler_file_path="C:/Program Files/LLVM/bin/clang-cl.exe"
compiler_file_path="C:/Program Files/LLVM/bin/clang-cl.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 = 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 = 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

3
buildbot/worker/blender/update.py
View File

@ -48,4 +48,7 @@ def update(builder: worker.blender.CodeBuilder) -> None:
builder.architecture, builder.architecture,
] ]
if builder.track_id not in ("v330", "v360", "vexp"):
cmd += ["--prune-destructive"]
worker.utils.call(cmd) worker.utils.call(cmd)