@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix some logic in WaitForPreviousBuildStep
Summary: Fixes T5062. See inlines.
Test Plan: Did not test whatsoever.
Reviewers: hach-que
Reviewed By: hach-que
Subscribers: epriestley
Maniphest Tasks: T5062
Differential Revision: https://secure.phabricator.com/D9132
+18
-18
+18
-18
src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
+18
-18
src/applications/harbormaster/step/HarbormasterWaitForPreviousBuildStepImplementation.php
···
73
73
}
74
74
}
75
75
76
-
$buildables = id(new HarbormasterBuildableQuery())
77
-
->setViewer(PhabricatorUser::getOmnipotentUser())
78
-
->withBuildablePHIDs($build_objects)
79
-
->withManualBuildables(false)
80
-
->execute();
81
-
$buildable_phids = mpull($buildables, 'getPHID');
82
-
83
-
if (!$buildable_phids) {
84
-
return array();
85
-
}
76
+
if ($build_objects) {
77
+
$buildables = id(new HarbormasterBuildableQuery())
78
+
->setViewer(PhabricatorUser::getOmnipotentUser())
79
+
->withBuildablePHIDs($build_objects)
80
+
->withManualBuildables(false)
81
+
->execute();
82
+
$buildable_phids = mpull($buildables, 'getPHID');
86
83
87
-
$builds = id(new HarbormasterBuildQuery())
88
-
->setViewer(PhabricatorUser::getOmnipotentUser())
89
-
->withBuildablePHIDs($buildable_phids)
90
-
->withBuildPlanPHIDs(array($plan->getPHID()))
91
-
->execute();
84
+
if ($buildable_phids) {
85
+
$builds = id(new HarbormasterBuildQuery())
86
+
->setViewer(PhabricatorUser::getOmnipotentUser())
87
+
->withBuildablePHIDs($buildable_phids)
88
+
->withBuildPlanPHIDs(array($plan->getPHID()))
89
+
->execute();
92
90
93
-
foreach ($builds as $build) {
94
-
if (!$build->isComplete()) {
95
-
$blockers[] = pht('Build %d', $build->getID());
91
+
foreach ($builds as $build) {
92
+
if (!$build->isComplete()) {
93
+
$blockers[] = pht('Build %d', $build->getID());
94
+
}
95
+
}
96
96
}
97
97
}
98
98