From a39133179197e9b9f9bbc5ae3ad9d32209410f2c Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 3 Sep 2018 11:07:34 +0200 Subject: [PATCH 1/2] [appveyor] minor CI fix --- .github/build-packages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/build-packages.php b/.github/build-packages.php index b67a699609..83f4b4336c 100644 --- a/.github/build-packages.php +++ b/.github/build-packages.php @@ -14,7 +14,7 @@ $packages = array(); $flags = \PHP_VERSION_ID >= 50400 ? JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE : 0; 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) { exit($exitStatus); } From 9d24400b1f52c842c9d13feb376fd860966c1e9f Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Mon, 3 Sep 2018 12:05:33 +0200 Subject: [PATCH 2/2] [appveyor] fix bis --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8d335c600d..e909b1beb4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -56,7 +56,7 @@ install: - php composer.phar self-update - copy /Y .composer\* %APPDATA%\Composer\ - 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) - php composer.phar config platform.php 5.3.9 - php composer.phar update --no-progress --no-suggest --ansi