Fix make_update for libraries update
- git lfs install was called a bit too late, after the libraries has been checked out, leaving the checkout in a non-resolved state. - Update blender code first, allowing proper submodule hash to be pulled. Pull Request: https://projects.blender.org/blender/blender/pulls/118615
This commit is contained in:
parent
8dfb87d1af
commit
7b472b83a3
|
@ -543,8 +543,6 @@ def submodules_update(args: argparse.Namespace, branch: Optional[str]) -> str:
|
||||||
|
|
||||||
msg = ""
|
msg = ""
|
||||||
|
|
||||||
call((args.git_command, "lfs", "install"))
|
|
||||||
|
|
||||||
msg += scripts_submodules_update(args, branch)
|
msg += scripts_submodules_update(args, branch)
|
||||||
|
|
||||||
msg += floating_libraries_update(args, branch)
|
msg += floating_libraries_update(args, branch)
|
||||||
|
@ -572,10 +570,8 @@ if __name__ == "__main__":
|
||||||
else:
|
else:
|
||||||
branch = 'main'
|
branch = 'main'
|
||||||
|
|
||||||
if not args.no_libraries:
|
# Submodules and precompiled libraries require Git LFS.
|
||||||
update_precompiled_libraries(args)
|
call((args.git_command, "lfs", "install"))
|
||||||
if args.use_tests:
|
|
||||||
update_tests_data_files(args)
|
|
||||||
|
|
||||||
if not args.no_blender:
|
if not args.no_blender:
|
||||||
blender_skip_msg = git_update_skip(args)
|
blender_skip_msg = git_update_skip(args)
|
||||||
|
@ -584,6 +580,11 @@ if __name__ == "__main__":
|
||||||
if blender_skip_msg:
|
if blender_skip_msg:
|
||||||
blender_skip_msg = "Blender repository skipped: " + blender_skip_msg + "\n"
|
blender_skip_msg = "Blender repository skipped: " + blender_skip_msg + "\n"
|
||||||
|
|
||||||
|
if not args.no_libraries:
|
||||||
|
update_precompiled_libraries(args)
|
||||||
|
if args.use_tests:
|
||||||
|
update_tests_data_files(args)
|
||||||
|
|
||||||
if not args.no_submodules:
|
if not args.no_submodules:
|
||||||
submodules_skip_msg = submodules_update(args, branch)
|
submodules_skip_msg = submodules_update(args, branch)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue