BUILDBOT: Update logo and colors

config/master.cfg

@@ -109,7 +109,7 @@ scumm_package_other = copy.deepcopy(scumm_package_master)
 scumm_tools_package_master = [
 	"COPYING",
 	"NEWS",
-	"README",
+	"README.md",
 	"convert_dxa.sh",
 	"convert_dxa.bat"
 ]
@@ -1315,17 +1315,21 @@ scumm_platforms_other = {}
 
 c = BuildmasterConfig = {}
 
-####### BUILDSLAVES
+c["buildbotNetUsageData"] = None
+
+####### BUILDWORKERS
 
-# The slave buildbots.
+# The worker buildbots.
 
-from buildbot.buildslave import BuildSlave
+from buildbot.plugins import worker
 
 # the fetching schedulers count as build too, and since its waiting for
 # the compiling builders, we need at least 2 concurrent jobs
-slave_vm2 = "ScummVM Slave #1"
+worker_vm2 = "ScummVM-Worker-1"
 
-c["slaves"] = [ BuildSlave(slave_vm2, scummsecret.pwd_localslave) ]
+c["workers"] = [
+	worker.Worker(worker_vm2, scummsecret.pwd_localworker)
+]
 c["protocols"] = {"pb": {"port": "tcp:9989:interface=127.0.0.1"}}
 
 ####### SCHEDULERS
@@ -1445,23 +1449,24 @@ c["schedulers"].append(ForceScheduler(name = "force-scheduler",
 
 from buildbot.process import factory
 from buildbot.process.properties import WithProperties
-from buildbot.steps.source import Git
+from buildbot.plugins import steps
 from buildbot.steps.trigger import Trigger
 from buildbot.steps.shell import Compile, Test
 
+Git = steps.Git
 # One lock to rule them all.
 # Used to prevent source updates when the nightly schedulers are busy.
-from buildbot.locks import MasterLock, SlaveLock
+from buildbot.locks import MasterLock, WorkerLock
 lock_src = MasterLock("source")
-lock_bot = SlaveLock("slave", maxCount = 1)
+lock_bot = WorkerLock("worker", maxCount = 1)
 
 # The source fetching builders
 
 c["builders"] = []
 
 f = factory.BuildFactory()
 f.useProgress = False
-f.addStep(Git(mode = "update",
+f.addStep(Git(mode = "incremental",
 				workdir = "src",
 				repourl = scumm_giturl,
 				branch = scumm_branch_master))
@@ -1472,16 +1477,16 @@ f.addStep(Trigger(schedulerNames = [ "master" ],
 
 c["builders"].append( {
 	"name": "fetch-master",
-	"slavename": slave_vm2,
+	"workername": worker_vm2,
 	"builddir": "src-master",
 	"factory": f,
-	"category": "fetch",
+	"tags": ["fetch"],
 	"locks": [ lock_src.access("exclusive") ]
 })
 
 f = factory.BuildFactory()
 f.useProgress = False
-f.addStep(Git(mode = "update",
+f.addStep(Git(mode = "incremental",
 				workdir = "src",
 				repourl = scumm_giturl,
 				branch = scumm_branch_stable))
@@ -1491,16 +1496,16 @@ f.addStep(Trigger(schedulerNames = [ "stable" ],
 
 c["builders"].append( {
 	"name": "fetch-stable",
-	"slavename": slave_vm2,
+	"workername": worker_vm2,
 	"builddir": "src-stable",
 	"factory": f,
-	"category": "fetch",
+	"tags": ["fetch"],
 	"locks": [ lock_src.access("exclusive") ]
 })
 
 f = factory.BuildFactory()
 f.useProgress = False
-f.addStep(Git(mode = "update",
+f.addStep(Git(mode = "incremental",
 				workdir = "src",
 				repourl = scumm_tools_giturl,
 				branch = scumm_tools_branch_master))
@@ -1511,10 +1516,10 @@ f.addStep(Trigger(schedulerNames = [ "tools-master" ],
 
 c["builders"].append( {
 	"name": "fetch-tools-master",
-	"slavename": slave_vm2,
+	"workername": worker_vm2,
 	"builddir": "src-tools-master",
 	"factory": f,
-	"category": "fetch",
+	"tags": ["fetch"],
 	"locks": [ lock_src.access("exclusive") ]
 })
 
@@ -1532,10 +1537,10 @@ c["builders"].append( {
 #
 #c["builders"].append( {
 #	"name": "fetch-other",
-#	"slavename": slave_vm2,
+#	"workername": worker_vm2,
 #	"builddir": "src-other",
 #	"factory": f,
-#	"category": "fetch",
+#	"tags": ["fetch"],
 #	"locks": [ lock_src.access("exclusive") ]
 #})
 
@@ -1551,10 +1556,10 @@ if scumm_build_nightly_master:
 
 	c["builders"].append( {
 		"name": "nightly-master",
-		"slavename": slave_vm2,
+		"workername": worker_vm2,
 		"builddir": "nightly-master",
 		"factory": f,
-		"category": "nightly",
+		"tags": ["nightly"],
 		"locks": [ lock_src.access("exclusive") ]
 	})
 
@@ -1568,10 +1573,10 @@ if scumm_build_nightly_stable:
 
 	c["builders"].append( {
 		"name": "nightly-stable",
-		"slavename": slave_vm2,
+		"workername": worker_vm2,
 		"builddir": "nightly-stable",
 		"factory": f,
-		"category": "nightly",
+		"tags": ["nightly"],
 		"locks": [ lock_src.access("exclusive") ]
 	})
 
@@ -1585,10 +1590,10 @@ if scumm_tools_build_nightly_master:
 
 	c["builders"].append( {
 		"name": "tools-nightly-master",
-		"slavename": slave_vm2,
+		"workername": worker_vm2,
 		"builddir": "tools-nightly-master",
 		"factory": f,
-		"category": "nightly",
+		"tags": ["nightly"],
 		"locks": [ lock_src.access("exclusive") ]
 	})
 
@@ -1602,10 +1607,10 @@ if scumm_build_nightly_other:
 
 	c["builders"].append( {
 		"name": "nightly-other",
-		"slavename": slave_vm2,
+		"workername": worker_vm2,
 		"builddir": "nightly-other",
 		"factory": f,
-		"category": "nightly",
+		"tags": ["nightly"],
 		"locks": [ lock_src.access("exclusive") ]
 	})
 
@@ -1661,11 +1666,11 @@ for name, config in scumm_platforms_master.items():
 
 	c["builders"].append( {
 		"name": "master-%s" % name,
-		"slavename": slave_vm2,
+		"workername": worker_vm2,
 		"builddir": "master-%s" % name,
 		"factory": f,
 		"locks": [ lock_bot.access('counting') ],
-		"category": "master"
+		"tags": ["master"],
 	})
 
 configure_path = "../../src-stable/src/configure"
@@ -1716,11 +1721,11 @@ for name, config in scumm_platforms_stable.items():
 
 	c["builders"].append( {
 		"name": "stable-%s" % name,
-		"slavename": slave_vm2,
+		"workername": worker_vm2,
 		"builddir": "stable-%s" % name,
 		"factory": f,
 		"locks": [ lock_bot.access('counting') ],
-		"category": "stable"
+		"tags": ["stable"]
 	})
 
 configure_path = "../../src-tools-master/src/configure"
@@ -1775,11 +1780,11 @@ for name, config in scumm_platforms_master.items():
 
 	c["builders"].append( {
 		"name": "tools-master-%s" % name,
-		"slavename": slave_vm2,
+		"workername": worker_vm2,
 		"builddir": "tools-master-%s" % name,
 		"factory": f,
 		"locks": [ lock_bot.access('counting') ],
-		"category": "tools-master"
+		"tags": ["tools-master"]
 	})
 
 configure_path = "../../src-other/src/configure"
@@ -1832,41 +1837,24 @@ for name, config in scumm_platforms_other.items():
 
 	c["builders"].append( {
 		"name": "other-%s" % name,
-		"slavename": slave_vm2,
+		"workername": worker_vm2,
 		"builddir": "other-%s" % name,
 		"factory": f,
 		"locks": [ lock_bot.access('counting') ],
-		"category": "other"
+		"tags": ["other"]
 	})
 
 ####### STATUS TARGETS
 
-c["status"] = []
-
-from buildbot.status.html import WebStatus
-from buildbot.status.web.authz import Authz
-from buildbot.status.web.auth import HTPasswdAprAuth
+from buildbot.plugins import util
 
 htfile = os.path.join(expanded_base_dir, 'scumm_htpasswd')
-web_authz = None
-
-if os.path.exists(htfile):
-	web_authz = Authz(auth=HTPasswdAprAuth(htfile),
-		forceBuild='auth', # only authenticated users
-		forceAllBuilds='auth', # only authenticated users
-		stopBuild='auth', # only authenticated users
-		stopAllBuilds='auth', # only authenticated users
-		cancelPendingBuild='auth', # only authenticated users
-	 )
-
-c["status"].append(
-		WebStatus(http_port = "tcp:8010:interface=127.0.0.1",
-			change_hook_dialects = { 'github' : True },
-			change_hook_auth = [ "file:%s" % (os.path.join(expanded_base_dir, "changehook.passwd")) ],
-			order_console_by_time = True,
-			authz = web_authz
-		)
-	)
+
+c["www"] = {
+	'port': 8010,
+	'auth': util.HTPasswdAuth(htfile),
+	'authz': util.Authz(allowRules=[util.AnyControlEndpointMatcher(role="admins")],roleMatchers=[])
+}
 
 irc = scumm.IRC("irc.freenode.org", "ScummBot",
 				channel = "#scummvm",
@@ -1875,7 +1863,7 @@ irc = scumm.IRC("irc.freenode.org", "ScummBot",
 				categories = [ "master", "stable", "tools-master", "other" ],
 				stableTimer = 15 * 60)
 
-c["status"].append(irc)
+#c["services"].append(irc)
 
 ####### PROJECT IDENTITY
 

config/scumm.py

@@ -12,7 +12,7 @@
 
 from buildbot import interfaces, util
 from buildbot import version
-from buildbot.sourcestamp import SourceStamp
+#from buildbot.sourcestamp import SourceStamp
 from buildbot.status import base
 from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, EXCEPTION, SKIPPED
 from buildbot import scheduler

public_html/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/mstile-150x150.png"/>
+            <TileColor>#cc6600</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

public_html/builds.html

@@ -1,12 +1,21 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-    <title>ScummVM :: Buildbot</title>
-    <link type="text/css" href="default.css" rel="stylesheet">
-    <link href="favicon.ico" rel="shortcut icon">
+  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+  <title>ScummVM :: Buildbot</title>
+  <link type="text/css" href="default.css" rel="stylesheet">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=LbyOzGdbo9">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=LbyOzGdbo9">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=LbyOzGdbo9">
+  <link rel="manifest" href="/site.webmanifest?v=LbyOzGdbo9">
+  <link rel="mask-icon" href="/safari-pinned-tab.svg?v=LbyOzGdbo9" color="#fb30ae">
+  <link rel="shortcut icon" href="/favicon.ico?v=LbyOzGdbo9">
+  <meta name="apple-mobile-web-app-title" content="ScummVM Buildbot">
+  <meta name="application-name" content="ScummVM Buildbot">
+  <meta name="msapplication-TileColor" content="#cc6600">
+  <meta name="theme-color" content="#cc6600">
 </head>
-<body style="margin: 10px; background-image: url(images/body-bg.png);">
+<body>
     <!-- TODO: Make this into a nice theme not a quick and dirty hack. -->
     <table align="center" border="0" cellpadding="0" cellspacing="0" width="90%">
         <tbody>

public_html/builds.html.head

@@ -1,12 +1,21 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-    <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
-    <title>ScummVM :: Buildbot</title>
-    <link type="text/css" href="default.css" rel="stylesheet">
-    <link href="favicon.ico" rel="shortcut icon">
+  <meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+  <title>ScummVM :: Buildbot</title>
+  <link type="text/css" href="default.css" rel="stylesheet">
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png?v=LbyOzGdbo9">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png?v=LbyOzGdbo9">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png?v=LbyOzGdbo9">
+  <link rel="manifest" href="/site.webmanifest?v=LbyOzGdbo9">
+  <link rel="mask-icon" href="/safari-pinned-tab.svg?v=LbyOzGdbo9" color="#fb30ae">
+  <link rel="shortcut icon" href="/favicon.ico?v=LbyOzGdbo9">
+  <meta name="apple-mobile-web-app-title" content="ScummVM Buildbot">
+  <meta name="application-name" content="ScummVM Buildbot">
+  <meta name="msapplication-TileColor" content="#cc6600">
+  <meta name="theme-color" content="#cc6600">
 </head>
-<body style="margin: 10px; background-image: url(images/body-bg.png);">
+<body>
     <!-- TODO: Make this into a nice theme not a quick and dirty hack. -->
     <table align="center" border="0" cellpadding="0" cellspacing="0" width="90%">
         <tbody>