summaryrefslogtreecommitdiff
path: root/buildmaster
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-04-17 09:36:08 +0200
committerErich Eckner <git@eckner.net>2018-04-17 09:36:08 +0200
commit8af016645fee5c0b22e69d46de9b3401c1bc82d3 (patch)
tree992acf6649f005c3d6891d767a5509fdbb91024b /buildmaster
parent951d045cb95cc8e0d07c97104a2b9a5e9ea5ffc8 (diff)
downloadarchweb32-8af016645fee5c0b22e69d46de9b3401c1bc82d3.tar.xz
lib/ new
Diffstat (limited to 'buildmaster')
-rw-r--r--buildmaster/build-list.php39
1 files changed, 22 insertions, 17 deletions
diff --git a/buildmaster/build-list.php b/buildmaster/build-list.php
index d576019..966c5b5 100644
--- a/buildmaster/build-list.php
+++ b/buildmaster/build-list.php
@@ -1,7 +1,7 @@
-<html>
-<head>
<?php
+include "lib/mysql.php";
+
if (isset($_GET["show"]))
$to_show=$_GET["show"];
else
@@ -14,21 +14,9 @@ elseif ($to_show == "broken")
elseif ($to_show == "next")
$match = "";
else
- die();
-
-print "<title>List of " . $to_show . " package builds</title>\n";
-print "<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/style.css\">\n";
-print "</head>\n";
-print "<body>\n";
-print "<a href=\"https://buildmaster.archlinux32.org/\">Start page</a>\n";
-print "<a href=\"https://buildmaster.archlinux32.org/build-logs/\">build logs</a><br>\n";
+ die_500("Unknown parameter for \"show\".");
-$mysql = new mysqli("localhost", "webserver", "empty", "buildmaster");
-if ($mysql->connect_error) {
- die("Connection failed: " . $mysql->connect_error);
-}
-
-$result = $mysql -> query(
+$result = mysql_run_query(
"SELECT DISTINCT " .
"`build_assignments`.`id`," .
"`build_assignments`.`is_blocked`," .
@@ -65,6 +53,7 @@ $result = $mysql -> query(
"LEFT JOIN `build_slaves` ON `build_slaves`.`currently_building`=`build_assignments`.`id` " .
"WHERE `repositories`.`name`=\"build-list\"" . $match
);
+
if ($result -> num_rows > 0) {
$count = 0;
@@ -76,7 +65,7 @@ if ($result -> num_rows > 0) {
($row["dependencies_pending"]==1))
continue;
- $fail_result = $mysql -> query(
+ $fail_result = mysql_run_query(
"SELECT " .
"`fail_reasons`.`name`, " .
"`failed_builds`.`log_file` " .
@@ -167,6 +156,22 @@ if ($result -> num_rows > 0) {
$count++;
}
+}
+
+?>
+<html>
+<head>
+<?php
+
+print "<title>List of " . $to_show . " package builds</title>\n";
+print "<link rel=\"stylesheet\" type=\"text/css\" href=\"/static/style.css\">\n";
+print "</head>\n";
+print "<body>\n";
+print "<a href=\"https://buildmaster.archlinux32.org/\">Start page</a>\n";
+print "<a href=\"https://buildmaster.archlinux32.org/build-logs/\">build logs</a><br>\n";
+
+if ($count > 0) {
+
usort(
$rows,
function (array $a, array $b) {