[Bf-blender-cvs] [21d862494b2] master: Buildbot: Don't use builder name in the build directory

Sergey Sharybin noreply at git.blender.org
Tue Jun 16 14:14:13 CEST 2020


Commit: 21d862494b221499513df7ef8388440f264aee51
Author: Sergey Sharybin
Date:   Tue Jun 16 10:41:18 2020 +0200
Branches: master
https://developer.blender.org/rB21d862494b221499513df7ef8388440f264aee51

Buildbot: Don't use builder name in the build directory

The directory layout on worker goes as following:

  <Worker>
    <Builder Name>
      blender.git/
      build/
      install/
      lib/

Adding an extra <Builder Name> after build is redundant.

Differential Revision: https://developer.blender.org/D8045

===================================================================

M	build_files/buildbot/buildbot_utils.py

===================================================================

diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py
index 39a00980cc8..e8adf5ba810 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



More information about the Bf-blender-cvs mailing list