Skip to content

Commit c3ddb9f

Browse files
Merge branch '4.1'
* 4.1: [appveyor] fix bis [appveyor] minor CI fix
2 parents 428c25f + ccc2157 commit c3ddb9f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/build-packages.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
$flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0;
1515

1616
foreach ($dirs as $k => $dir) {
17-
if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {
17+
if (!system("git diff --name-only \"$mergeBase\" -- $dir", $exitStatus)) {
1818
if ($exitStatus) {
1919
exit($exitStatus);
2020
}

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ install:
4545
- php composer.phar self-update
4646
- copy /Y .composer\* %APPDATA%\Composer\
4747
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
48-
- php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
48+
- php .github/build-packages.php %APPVEYOR_REPO_COMMIT%^^ src\Symfony\Bridge\PhpUnit
4949
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5050
- php composer.phar update --no-progress --no-suggest --ansi
5151
- php phpunit install

0 commit comments

Comments
 (0)