diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.7' into 2.8

Browse Source 
* 2.7:
  [travis] Reduce composer.json merge conflicts on per-components tests
This commit is contained in:
Nicolas Grekas 2015-10-24 17:20:42 +02:00
commit 3e38e64113
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.php
View File

@ -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';