File classes/Builds.php changed (mode: 100644) (index 765093b..6c7098b) |
... |
... |
class Builds |
132 |
132 |
*/ |
*/ |
133 |
133 |
public static function builderCmp($a, $b) |
public static function builderCmp($a, $b) |
134 |
134 |
{ |
{ |
|
135 |
|
// buildset IDs are the primary key |
|
136 |
|
if ($a->buildset != $b->buildset) { |
|
137 |
|
return $a->buildset - $b->buildset; |
|
138 |
|
} |
|
139 |
|
|
|
140 |
|
// builder name is the secondary key |
135 |
141 |
$condA = (strpos($a, '/') !== false); |
$condA = (strpos($a, '/') !== false); |
136 |
142 |
$condB = (strpos($b, '/') !== false); |
$condB = (strpos($b, '/') !== false); |
137 |
143 |
if ($condA ^ $condB) { |
if ($condA ^ $condB) { |
File daemon.php changed (mode: 100644) (index 7fbe0de..ea2cee1) |
... |
... |
function serve() |
83 |
83 |
*/ |
*/ |
84 |
84 |
function runBuilds($builds) |
function runBuilds($builds) |
85 |
85 |
{ |
{ |
86 |
|
// TODO: sort $builds according to $build->$buildset and then by |
|
87 |
|
// $build->buildername same way as it's done for the dashboard |
|
|
86 |
|
$builders = []; |
88 |
87 |
foreach ($builds as $build) { |
foreach ($builds as $build) { |
|
88 |
|
$builders[$build->buildername] = $build; |
|
89 |
|
} |
|
90 |
|
// sort builders by their name |
|
91 |
|
uksort($builders, "Builds::builderCmp"); |
|
92 |
|
|
|
93 |
|
foreach ($builders as $build) { |
89 |
94 |
$buildset = Buildset::get($build->buildset); |
$buildset = Buildset::get($build->buildset); |
90 |
95 |
|
|
91 |
96 |
if (!putenv('FRAGILE_REF=' . $buildset->name)) { |
if (!putenv('FRAGILE_REF=' . $buildset->name)) { |