deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Inverted priority of configs: phpci.yml is primary now

Browse source
This commit is contained in:
Corpsee 2014-04-10 23:41:02 +07:00
parent f87fc2ef90
commit ccb3d91ae1
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
PHPCI/Model/Build.php
View file

@ -88,13 +88,16 @@ class Build extends BuildBase
*/
protected function handleConfig(Builder $builder, $buildPath)
{
$build_config = $this->getProject()->getBuildConfig();
if (!$build_config) {
if (!is_file($buildPath . '/phpci.yml')) {
if (is_file($buildPath . '/phpci.yml')) {
$build_config = file_get_contents($buildPath . '/phpci.yml');
}
if (!is_file($buildPath . '/phpci.yml') || !$build_config) {
$build_config = $this->getProject()->getBuildConfig();
if (!$build_config) {
$builder->logFailure('Project does not contain a phpci.yml file.');
return false;
}
$build_config = file_get_contents($buildPath . '/phpci.yml');
}
$yamlParser = new YamlParser();