Defaulting to using neither --prefer-source or --prefer-dist for composer. Allow user to specify either.
This commit is contained in:
parent
21d5f4954f
commit
6418fde928
|
@ -13,7 +13,6 @@ build_settings:
|
||||||
setup:
|
setup:
|
||||||
composer:
|
composer:
|
||||||
action: "install"
|
action: "install"
|
||||||
prefer_dist: false
|
|
||||||
|
|
||||||
test:
|
test:
|
||||||
php_parallel_lint:
|
php_parallel_lint:
|
||||||
|
|
|
@ -61,6 +61,7 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
|
||||||
$this->directory = $path;
|
$this->directory = $path;
|
||||||
$this->action = 'install';
|
$this->action = 'install';
|
||||||
$this->preferDist = false;
|
$this->preferDist = false;
|
||||||
|
$this->preferSource = false;
|
||||||
$this->nodev = false;
|
$this->nodev = false;
|
||||||
|
|
||||||
if (array_key_exists('directory', $options)) {
|
if (array_key_exists('directory', $options)) {
|
||||||
|
@ -75,6 +76,11 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
|
||||||
$this->preferDist = (bool)$options['prefer_dist'];
|
$this->preferDist = (bool)$options['prefer_dist'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (array_key_exists('prefer_source', $options)) {
|
||||||
|
$this->preferDist = false;
|
||||||
|
$this->preferSource = (bool)$options['prefer_source'];
|
||||||
|
}
|
||||||
|
|
||||||
if (array_key_exists('no_dev', $options)) {
|
if (array_key_exists('no_dev', $options)) {
|
||||||
$this->nodev = (bool)$options['no_dev'];
|
$this->nodev = (bool)$options['no_dev'];
|
||||||
}
|
}
|
||||||
|
@ -98,7 +104,9 @@ class Composer implements PHPCI\Plugin, PHPCI\ZeroConfigPlugin
|
||||||
if ($this->preferDist) {
|
if ($this->preferDist) {
|
||||||
$this->phpci->log('Using --prefer-dist flag');
|
$this->phpci->log('Using --prefer-dist flag');
|
||||||
$cmd .= ' --prefer-dist';
|
$cmd .= ' --prefer-dist';
|
||||||
} else {
|
}
|
||||||
|
|
||||||
|
if ($this->preferSource) {
|
||||||
$this->phpci->log('Using --prefer-source flag');
|
$this->phpci->log('Using --prefer-source flag');
|
||||||
$cmd .= ' --prefer-source';
|
$cmd .= ' --prefer-source';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue