deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added allowed fail status for plugins (See build summary)

Browse source
This commit is contained in:
Dmitry Khomutov 2017-04-03 21:04:27 +07:00
parent cb4d7a268e
commit d54c1978b9
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
5 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
public/assets/js/build-plugins/summary.js
View file

@ -3,8 +3,8 @@ var SummaryPlugin = ActiveBuild.UiPlugin.extend({
css: 'col-xs-12',
title: Lang.get('build-summary'),
box: true,
statusLabels: [ Lang.get('pending'), Lang.get('running'), Lang.get('success'), Lang.get('failed') ],
statusClasses: ['info', 'warning', 'success', 'danger'],
statusLabels: [Lang.get('pending'), Lang.get('running'), Lang.get('success'), Lang.get('failed'), Lang.get('failed_allowed')],
statusClasses: ['info', 'warning', 'success', 'danger', 'danger'],
register: function() {
var self = this;

1
src/PHPCensor/Languages/lang.en.php
View file

@ -83,6 +83,7 @@ PHP Censor',
'running' => 'Running',
'success' => 'Success',
'failed' => 'Failed',
'failed_allowed' => 'Failed (Allowed)',
'error' => 'Error',
'skipped' => 'Skipped',
'trace' => 'Stack trace',

1
src/PHPCensor/Languages/lang.ru.php
View file

@ -81,6 +81,7 @@ PHP Censor',
'running' => 'Запущена',
'success' => 'Успешно',
'failed' => 'Провал',
'failed_allowed' => 'Провал (Допустим)',
'error' => 'Ошибка',
'skipped' => 'Пропущено',
'trace' => 'Стек вызова',

9
src/PHPCensor/Model/Build.php
View file

@ -21,10 +21,11 @@ class Build extends Model
const STAGE_FIXED = 'fixed';
const STAGE_BROKEN = 'broken';
const STATUS_PENDING = 0;
const STATUS_RUNNING = 1;
const STATUS_SUCCESS = 2;
const STATUS_FAILED = 3;
const STATUS_PENDING = 0;
const STATUS_RUNNING = 1;
const STATUS_SUCCESS = 2;
const STATUS_FAILED = 3;
const STATUS_FAILED_ALLOWED = 4;
/**
* @var array

7
src/PHPCensor/Plugin/Util/Executor.php
View file

@ -146,8 +146,7 @@ class Executor
$this->logger->logSuccess('PLUGIN: SUCCESS');
$this->setPluginStatus($stage, $plugin, Build::STATUS_SUCCESS);
} else {
// Execution failed
$this->setPluginStatus($stage, $plugin, Build::STATUS_FAILED);
$status = Build::STATUS_FAILED;
if ($stage === Build::STAGE_SETUP) {
$this->logger->logFailure('PLUGIN: FAILED');
@ -164,9 +163,13 @@ class Executor
$this->logger->logFailure('PLUGIN: FAILED');
$success = false;
} else {
$status = Build::STATUS_FAILED_ALLOWED;
$this->logger->logFailure('PLUGIN: FAILED (ALLOWED)');
}
}
$this->setPluginStatus($stage, $plugin, $status);
}
}