Updating builds to try database config first, and fall back to file config.
This commit is contained in:
parent
31165a6bfa
commit
7ad1d317cd
|
@ -99,6 +99,11 @@ class Build extends BuildBase
|
||||||
{
|
{
|
||||||
$build_config = null;
|
$build_config = null;
|
||||||
|
|
||||||
|
// Try getting the project build config from the database:
|
||||||
|
if (empty($build_config)) {
|
||||||
|
$build_config = $this->getProject()->getBuildConfig();
|
||||||
|
}
|
||||||
|
|
||||||
// Try .phpci.yml
|
// Try .phpci.yml
|
||||||
if (is_file($buildPath . '/.phpci.yml')) {
|
if (is_file($buildPath . '/.phpci.yml')) {
|
||||||
$build_config = file_get_contents($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');
|
$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:
|
// Fall back to zero config plugins:
|
||||||
if (empty($build_config)) {
|
if (empty($build_config)) {
|
||||||
$build_config = $this->getZeroConfigPlugins($builder);
|
$build_config = $this->getZeroConfigPlugins($builder);
|
||||||
|
|
Loading…
Reference in a new issue