Fix for linux buildslaves. Now they should be able to compile branches.
This commit is contained in:
parent
06ca703737
commit
d84c6a3cdb
|
@ -57,7 +57,7 @@ else:
|
|||
scons_cmd = ['python', 'scons/scons.py']
|
||||
scons_options = []
|
||||
|
||||
if builder.startswith('linux'):
|
||||
if builder.find('linux') != -1:
|
||||
import shutil
|
||||
|
||||
# We're using the same rules as release builder, so tweak
|
||||
|
|
|
@ -43,7 +43,7 @@ if builder.find('scons') != -1:
|
|||
os.chdir('../blender')
|
||||
scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave']
|
||||
|
||||
if builder.startswith('linux'):
|
||||
if builder.find('linux') != -1:
|
||||
buildbot_dir = os.path.dirname(os.path.realpath(__file__))
|
||||
config_dir = os.path.join(buildbot_dir, 'config')
|
||||
build_dir = os.path.join('..', 'build', builder)
|
||||
|
|
Loading…
Reference in New Issue