Merge branch '2.8' into 3.4
* 2.8: [appveyor] fix bis [appveyor] minor CI fix
This commit is contained in:
commit
fc484d77ff
2
.github/build-packages.php
vendored
2
.github/build-packages.php
vendored
@ -14,7 +14,7 @@ $packages = array();
|
|||||||
$flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
|
$flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
|
||||||
|
|
||||||
foreach ($dirs as $k => $dir) {
|
foreach ($dirs as $k => $dir) {
|
||||||
if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {
|
if (!system("git diff --name-only \"$mergeBase\" -- $dir", $exitStatus)) {
|
||||||
if ($exitStatus) {
|
if ($exitStatus) {
|
||||||
exit($exitStatus);
|
exit($exitStatus);
|
||||||
}
|
}
|
||||||
|
@ -53,7 +53,7 @@ install:
|
|||||||
- php composer.phar self-update
|
- php composer.phar self-update
|
||||||
- copy /Y .composer\* %APPDATA%\Composer\
|
- copy /Y .composer\* %APPDATA%\Composer\
|
||||||
- php composer.phar global require --no-progress --no-scripts --no-plugins 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
|
- php .github/build-packages.php %APPVEYOR_REPO_COMMIT%^^ 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)
|
- 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
|
- php composer.phar config platform.php 5.5.9
|
||||||
- php composer.phar update --no-progress --no-suggest --ansi
|
- php composer.phar update --no-progress --no-suggest --ansi
|
||||||
|
Reference in New Issue
Block a user