Merge branch '3.4' into 4.1
* 3.4: [travis] fix composer.lock invalidation for deps=low
This commit is contained in:
commit
f4c8311106
4
.github/rm-invalid-lowest-lock-files.php
vendored
4
.github/rm-invalid-lowest-lock-files.php
vendored
@ -48,7 +48,6 @@ $composerJsons = array();
|
||||
|
||||
foreach ($dirs as $dir) {
|
||||
if (!file_exists($dir.'/composer.lock') || !$composerLock = @json_decode(file_get_contents($dir.'/composer.lock'), true)) {
|
||||
echo "$dir/composer.lock not found or invalid.\n";
|
||||
@unlink($dir.'/composer.lock');
|
||||
continue;
|
||||
}
|
||||
@ -62,7 +61,8 @@ foreach ($dirs as $dir) {
|
||||
@unlink($dir.'/composer.lock');
|
||||
continue;
|
||||
}
|
||||
$composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'], getRelevantContent($composerJson));
|
||||
$composerLock += array('packages' => array(), 'packages-dev' => array());
|
||||
$composerJsons[$composerJson['name']] = array($dir, $composerLock['packages'] + $composerLock['packages-dev'], getRelevantContent($composerJson));
|
||||
}
|
||||
|
||||
$referencedCommits = array();
|
||||
|
Reference in New Issue
Block a user