revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-23 22:10:55 +01:00
Code Issues Releases Wiki Activity

Allow build steps to explicitly fail the build

Browse source 
Summary: We've received feedback that the "core - exception" is incredibly confusing, to the point where developers see this and write off the build failure as a Phabricator error that is unrelated to their changes.

Test Plan: Ran a build with a `exit 1` run step, didn't see the "core - exception" appear.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D10090
This commit is contained in:
James Rhodes 2014-08-01 08:08:28 +10:00
parent c4cbc1a32d
commit aa87a524e2
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/__phutil_library_map__.php
View file

@ -654,6 +654,7 @@ phutil_register_library_map(array(
'HarbormasterBuildCommand' => 'applications/harbormaster/storage/HarbormasterBuildCommand.php',
'HarbormasterBuildDependencyDatasource' => 'applications/harbormaster/typeahead/HarbormasterBuildDependencyDatasource.php',
'HarbormasterBuildEngine' => 'applications/harbormaster/engine/HarbormasterBuildEngine.php',
'HarbormasterBuildFailureException' => 'applications/harbormaster/exception/HarbormasterBuildFailureException.php',
'HarbormasterBuildGraph' => 'applications/harbormaster/engine/HarbormasterBuildGraph.php',
'HarbormasterBuildItem' => 'applications/harbormaster/storage/build/HarbormasterBuildItem.php',
'HarbormasterBuildItemPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildItemPHIDType.php',
@ -3394,6 +3395,7 @@ phutil_register_library_map(array(
'HarbormasterBuildCommand' => 'HarbormasterDAO',
'HarbormasterBuildDependencyDatasource' => 'PhabricatorTypeaheadDatasource',
'HarbormasterBuildEngine' => 'Phobject',
'HarbormasterBuildFailureException' => 'Exception',
'HarbormasterBuildGraph' => 'AbstractDirectedGraph',
'HarbormasterBuildItem' => 'HarbormasterDAO',
'HarbormasterBuildItemPHIDType' => 'PhabricatorPHIDType',

5
src/applications/harbormaster/exception/HarbormasterBuildFailureException.php Normal file
View file

@ -0,0 +1,5 @@
<?php
final class HarbormasterBuildFailureException extends Exception {
}

2
src/applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php
View file

@ -68,7 +68,7 @@ final class HarbormasterCommandBuildStepImplementation
$log_stderr->finalize($start_stderr);
if ($err) {
throw new Exception(pht('Command failed with error %d.', $err));
throw new HarbormasterBuildFailureException();
}
}

4
src/applications/harbormaster/worker/HarbormasterTargetWorker.php
View file

@ -56,6 +56,10 @@ final class HarbormasterTargetWorker extends HarbormasterWorker {
// If the target wants to yield, let that escape without further
// processing. We'll resume after the task retries.
throw $ex;
} catch (HarbormasterBuildFailureException $ex) {
// A build step wants to fail explicitly.
$target->setTargetStatus(HarbormasterBuildTarget::STATUS_FAILED);
$target->save();
} catch (Exception $ex) {
phlog($ex);