From 548312ed8288bbb733f2c302d40ca179e658cd89 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 16 Jun 2020 10:41:18 +0200 Subject: Buildbot: Don't use builder name in the build directory The directory layout on worker goes as following: blender.git/ build/ install/ lib/ Adding an extra after build is redundant. Differential Revision: https://developer.blender.org/D8045 --- build_files/buildbot/buildbot_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py index 2dc1526c5e8..acede05869a 100644 --- a/build_files/buildbot/buildbot_utils.py +++ b/build_files/buildbot/buildbot_utils.py @@ -40,8 +40,8 @@ class Builder: # Buildbot runs from build/ directory self.blender_dir = os.path.abspath(os.path.join('..', 'blender.git')) - self.build_dir = os.path.abspath(os.path.join('..', 'build', name)) - self.install_dir = os.path.abspath(os.path.join('..', 'install', name)) + self.build_dir = os.path.abspath(os.path.join('..', 'build')) + self.install_dir = os.path.abspath(os.path.join('..', 'install')) self.upload_dir = os.path.abspath(os.path.join('..', 'install')) # Detect platform -- cgit v1.2.3