Buildbot: Checkout precomiled CentOS libraries

This commit is contained in:
Sergey Sharybin 2019-10-09 09:42:42 +02:00
parent 340b9c1dfc
commit 40a55be82c
Notes: blender-bot 2023-02-14 00:38:20 +01:00
Referenced by issue #70611, Numerous problems with Eevee and new Bump Map
Referenced by issue #70387, Sculpting with Original Normal rips edges
3 changed files with 9 additions and 3 deletions

View File

@ -28,4 +28,4 @@ if __name__ == "__main__":
# Run make update which handles all libraries and submodules.
make_update = os.path.join(builder.blender_dir, "build_files", "utils", "make_update.py")
buildbot_utils.call([sys.executable, make_update, '--no-blender', "--use-tests"])
buildbot_utils.call([sys.executable, make_update, '--no-blender', "--use-tests", "--use-centos-libraries"])

View File

@ -28,13 +28,17 @@ def parse_arguments():
parser.add_argument("--use-tests", action="store_true")
parser.add_argument("--svn-command", default="svn")
parser.add_argument("--git-command", default="git")
parser.add_argument("--use-centos-libraries", action="store_true")
return parser.parse_args()
def get_blender_git_root():
return check_output([args.git_command, "rev-parse", "--show-toplevel"])
# Setup for precompiled libraries and tests from svn.
def svn_update(args, release_version):
svn_non_interactive = [args.svn_command, '--non-interactive']
lib_dirpath = os.path.join('..', 'lib')
lib_dirpath = os.path.join(get_blender_git_root(), '..', 'lib')
svn_url = make_utils.svn_libraries_base_url(release_version)
# Checkout precompiled libraries
@ -45,6 +49,8 @@ def svn_update(args, release_version):
# this script is bundled as part of the precompiled libraries. However it
# is used by the buildbot.
lib_platform = "win64_vc14"
elif args.use_centos_libraries:
lib_platform = "linux_centos7_x86_64"
else:
# No precompiled libraries for Linux.
lib_platform = None

@ -1 +1 @@
Subproject commit b25958d1542648c890a9199694b4a9f6ec5ffcb3
Subproject commit a17cabe4c9976547b20078149a99c9bb58152d1d