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

Merge branch '2.8' into 3.4 

* 2.8:
  minor fix for travis
This commit is contained in:
Nicolas Grekas 2018-08-19 10:49:14 +02:00
parent 6bab0c10bb 13a5101502
commit b08dcfc88d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/rm-invalid-lowest-lock-files.php vendored
View File

@ -96,7 +96,7 @@ foreach ($composerJsons as list($dir, $lockedPackages)) {
}
}
if (!$referencedCommits || (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' === $_SERVER['TRAVIS_PULL_REQUEST'])) {
if (!$referencedCommits || (isset($_SERVER['TRAVIS_PULL_REQUEST']) && 'false' !== $_SERVER['TRAVIS_PULL_REQUEST'])) {
// cached commits cannot be stale for PRs
return;
}
@ -142,8 +142,10 @@ foreach ($referencedCommits as $name => $dirsByCommit) {
foreach ($referencedCommits as $name => $dirsByCommit) {
foreach ($dirsByCommit as $dirs) {
foreach ($dirs as $dir) {
echo "$dir/composer.lock references old commit for $name.\n";
@unlink($dir.'/composer.lock');
if (file_exists($dir.'/composer.lock')) {
echo "$dir/composer.lock references old commit for $name.\n";
@unlink($dir.'/composer.lock');
}
}
}
}

2
.travis.yml
View File

@ -216,7 +216,7 @@ install:
else
export SYMFONY_REQUIRE=">=$SYMFONY_VERSION"
fi
composer global require symfony/flex dev-master
composer global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
- |
# Legacy tests are skipped when deps=high and when the current branch version has not the same major version number than the next one

2
appveyor.yml
View File

@ -52,7 +52,7 @@ install:
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.7.1/composer.phar)
- php composer.phar self-update
- copy /Y .composer\* %APPDATA%\Composer\
- php composer.phar global require --no-progress symfony/flex dev-master
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
- php composer.phar config platform.php 5.5.9