diff --git a/PHPCI/Model/Build.php b/PHPCI/Model/Build.php index 27cf4055..20ff6a34 100644 --- a/PHPCI/Model/Build.php +++ b/PHPCI/Model/Build.php @@ -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();