switch osx buildslaves

ethereum · Dec 4, 2015 · d2d27c1 · d2d27c1
1 parent c8b0fdf
commit d2d27c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/builders.py b/builders.py
@@ -225,7 +225,7 @@
         BuilderConfig(
             name="OSX Go %s branch" % branch,
             builddir="build-go-osx-%s" % branch,
-            slavenames=["osx", "osx-two"],
+            slavenames=["osx"],
             factory=osx_go_factory(branch=branch),
             locks=[osx_lock.access('counting')]),
         # BuilderConfig(
@@ -241,16 +241,16 @@
         #     factory=brew_cpp_factory(branch=branch, headless=False),
         #     locks=[brew_lock.access('counting')]),
         BuilderConfig(
-            name="OSX Go %s Yosemite" % branch,
-            builddir="build-go-ethereum-%s-yosemite" % branch,
+            name="OSX Go %s El Capitan" % branch,
+            builddir="build-go-ethereum-%s-el-capitan" % branch,
             slavenames=["osx"],
-            factory=brew_go_factory(branch=branch, release='yosemite'),
+            factory=brew_go_factory(branch=branch, release='el_capitan'),
             locks=[brew_lock.access('counting')]),
         BuilderConfig(
-            name="OSX Go %s El Capitan" % branch,
-            builddir="build-go-ethereum-%s-el-capitan" % branch,
+            name="OSX Go %s Yosemite" % branch,
+            builddir="build-go-ethereum-%s-yosemite" % branch,
             slavenames=["osx-two"],
-            factory=brew_go_factory(branch=branch, release='el_capitan'),
+            factory=brew_go_factory(branch=branch, release='yosemite'),
             locks=[brew_lock.access('counting')]),
         # BuilderConfig(
         #     name="Windows C++ %s branch" % branch,

diff --git a/startup/buildslave-osx.plist b/startup/buildslave-osx.plist
@@ -24,7 +24,7 @@
 	<string>net.buildbot.slave</string>
 	<key>ProgramArguments</key>
 	<array>
-		<string>twistd</string>
+		<string>/usr/local/bin/twistd</string>
 		<string>--nodaemon</string>
 		<string>-y</string>
 		<string>./buildbot.tac</string>