diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-10-15 13:27:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-15 18:58:23 +0400 |
| commit | 616162774768bdb6057a799fb2b1f73aeb84d91b (patch) | |
| tree | aeaf028da7172eb1c8437beedc2e57ee68de9307 | |
| parent | 3cd2625132f4cdfe62a24721b9cc3931632084e7 (diff) | |
Buildbot: Rename testbuild branch to experimental-build and put the builds to dedicated folder
| -rw-r--r-- | build_files/buildbot/master.cfg | 2 | ||||
| -rw-r--r-- | build_files/buildbot/master_unpack.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 5f315337d3a..66b456f2586 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 ecacf3bff6f..651a68b414e 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) |