[Bf-blender-cvs] [de54b03] master: Buildbot: Rename testbuild branch to experimental-build and put the builds to dedicated folder

Bastien Montagne noreply at git.blender.org
Wed Oct 15 11:41:29 CEST 2014


Commit: de54b031c61a180f28e87a30d436eed7b420bdcc
Author: Bastien Montagne
Date:   Wed Oct 15 15:27:40 2014 +0600
Branches: master
https://developer.blender.org/rBde54b031c61a180f28e87a30d436eed7b420bdcc

Buildbot: Rename testbuild branch to experimental-build and put the builds to dedicated folder

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

M	build_files/buildbot/master.cfg
M	build_files/buildbot/master_unpack.py

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

diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 5f31533..66b456f 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -113,7 +113,7 @@ def schedule_force_build(name):
         codebases=[forcesched.CodebaseParameter(
                 codebase="blender",
                 branch=forcesched.ChoiceStringParameter(
-                    name="branch", choices=["master", "testbuild"], default="master"),
+                    name="branch", choices=["master", "experimental-build"], default="master"),
                 # Do not hide revision, can be handy!
                 repository=forcesched.FixedParameter(name="repository", default="", hide=True),
                 project=forcesched.FixedParameter(name="project", default="", hide=True)),
diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index ecacf3b..651a68b 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -117,6 +117,11 @@ if platform == '':
 
 # extract
 directory = 'public_html/download'
+if not branch or branch == 'master':
+    directory = 'public_html/download'
+elif branch == 'experimental-build':
+    directory = 'public_html/experimental'
+# else: put 'official' branches in their own public subdir of download/ ?
 
 try:
     zf = z.open(package)




More information about the Bf-blender-cvs mailing list