summaryrefslogtreecommitdiff
path: root/buildmaster
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-11 15:58:47 +0200
committerErich Eckner <git@eckner.net>2018-09-11 15:58:47 +0200
commit3845c00479fe9ba96fc7f206a71a79ee3b453586 (patch)
tree24e101582d1200918a761cf277060c40a0468b07 /buildmaster
parent425529b2200809eb73526b92bfc0f469689bf0bf (diff)
downloadarchweb32-3845c00479fe9ba96fc7f206a71a79ee3b453586.tar.xz
buildmaster/build-slaves.php: show architecture of build_assignment
Diffstat (limited to 'buildmaster')
-rw-r--r--buildmaster/build-slaves.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildmaster/build-slaves.php b/buildmaster/build-slaves.php
index c5a3ddc..6d0d9e2 100644
--- a/buildmaster/build-slaves.php
+++ b/buildmaster/build-slaves.php
@@ -21,7 +21,7 @@ $columns = array(
"currently_building" => array(
"label" => "currently building",
"mysql_name" => "cb",
- "mysql_query" => "`package_sources`.`pkgbase`",
+ "mysql_query" => "CONCAT(`architectures`.`name`,\"/\",`package_sources`.`pkgbase`)",
"sort" => "currently_building",
"title" => "pkgbase of currently building package"
),
@@ -89,6 +89,8 @@ $result = mysql_run_query(
" FROM `build_assignments`" .
" JOIN `package_sources`" .
" ON `build_assignments`.`package_source`=`package_sources`.`id`" .
+ " JOIN `architectures`" .
+ " ON `build_assignments`.`architecture`=`architectures`.`id`" .
" RIGHT JOIN `build_slaves`" .
" ON `build_slaves`.`currently_building`=`build_assignments`.`id`" .