mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix dev:check fail-fast not returning error (#11672)

Browse Source 
Fix dantherm definition
This commit is contained in:
Tony Murray
2020-05-23 14:43:41 -05:00
committed by GitHub
parent 3c4751e3c7
commit e7d954d7df
5 changed files with 36 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
LibreNMS/Util/CiHelper.php
View File

@@ -127,7 +127,7 @@ class CiHelper
$ret = $this->runCheck($check);
if ($this->flags['fail-fast'] && $ret !== 0 && $ret !== 250) {
return $return;
return $ret;
} else {
$return += $ret;
}
@@ -311,7 +311,7 @@ class CiHelper
return $ret;
}
if ($this->flags["{$type}_skip"]) {
if ($this->flags["{$type}_enable"] && $this->flags["{$type}_skip"]) {
echo ucfirst($type) . " check skipped.\n";
}
return 0;
@@ -394,10 +394,10 @@ class CiHelper
public function checkEnvSkips()
{
$this->flags['unit_skip'] = (bool)getenv('SKIP_UNIT_CHECK');
$this->flags['lint_skip'] = (bool)getenv('SKIP_LINT_CHECK');
$this->flags['web_skip'] = (bool)getenv('SKIP_WEB_CHECK');
$this->flags['style_skip'] = (bool)getenv('SKIP_STYLE_CHECK');
$this->flags['unit_skip'] = $this->flags['unit_skip'] || getenv('SKIP_UNIT_CHECK');
$this->flags['lint_skip'] = $this->flags['lint_skip'] || getenv('SKIP_LINT_CHECK');
$this->flags['web_skip'] = $this->flags['web_skip'] || getenv('SKIP_WEB_CHECK');
$this->flags['style_skip'] = $this->flags['style_skip'] || getenv('SKIP_STYLE_CHECK');
}
public function detectChangedFiles()

8
LibreNMS/Util/FileCategorizer.php
View File

@@ -37,7 +37,13 @@ class FileCategorizer extends Categorizer
if (getenv('CIHELPER_DEBUG')) {
$this->setSkippable(function ($item) {
return in_array($item, ['.travis.yml', 'LibreNMS/Util/CiHelper.php', 'LibreNMS/Util/FileCategorizer.php']);
return in_array($item, [
'.travis.yml',
'LibreNMS/Util/CiHelper.php',
'LibreNMS/Util/FileCategorizer.php',
'app/Console/Commands/DevCheckCommand.php',
'tests/Unit/CiHelperTest.php',
]);
});
}