[Bf-blender-cvs] [548312ed828] blender-v2.83-release: Buildbot: Don't use builder name in the build directory

Sergey Sharybin noreply at git.blender.org
Tue Jun 16 17:35:09 CEST 2020


Commit: 548312ed8288bbb733f2c302d40ca179e658cd89
Author: Sergey Sharybin
Date:   Tue Jun 16 10:41:18 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB548312ed8288bbb733f2c302d40ca179e658cd89

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 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



More information about the Bf-blender-cvs mailing list