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

Updating builds to try database config first, and fall back to file config.

Browse source
This commit is contained in:
Dan Cryer 2015-10-08 16:52:44 +01:00
parent 31165a6bfa
commit 7ad1d317cd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
PHPCI/Model/Build.php
View file

@ -99,6 +99,11 @@ class Build extends BuildBase
{
$build_config = null;
// Try getting the project build config from the database:
if (empty($build_config)) {
$build_config = $this->getProject()->getBuildConfig();
}
// Try .phpci.yml
if (is_file($buildPath . '/.phpci.yml')) {
$build_config = file_get_contents($buildPath . '/.phpci.yml');
@ -109,11 +114,6 @@ class Build extends BuildBase
$build_config = file_get_contents($buildPath . '/phpci.yml');
}
// Try getting the project build config from the database:
if (empty($build_config)) {
$build_config = $this->getProject()->getBuildConfig();
}
// Fall back to zero config plugins:
if (empty($build_config)) {
$build_config = $this->getZeroConfigPlugins($builder);