Merge branch '2.7' into 2.8
* 2.7: [travis] Reduce composer.json merge conflicts on per-components tests
This commit is contained in:
commit
3e38e64113
@ -19,13 +19,15 @@ foreach ($dirs as $dir) {
|
||||
}
|
||||
echo "$dir\n";
|
||||
|
||||
$package = json_decode(file_get_contents($dir.'/composer.json'));
|
||||
$json = file_get_contents($dir.'/composer.json');
|
||||
$package = json_decode($json);
|
||||
|
||||
$package->repositories = array(array(
|
||||
'type' => 'composer',
|
||||
'url' => 'file://'.__DIR__.'/',
|
||||
));
|
||||
file_put_contents($dir.'/composer.json', json_encode($package, $flags));
|
||||
$json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
|
||||
file_put_contents($dir.'/composer.json', $json);
|
||||
passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
|
||||
|
||||
$package->version = $branch.'.x-dev';
|
||||
|
Reference in New Issue
Block a user