Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 927ae8ad7fd1 · 2019-10-15T14:28:42.000+02:00
* 3.4:
  [CI] fix building local packages
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -46,6 +46,9 @@ install:
     - php composer.phar self-update
     - copy /Y .github\composer-config.json %APPDATA%\Composer\config.json
     - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master
+    - git config --global user.email ""
+    - git config --global user.name "Symfony"
+    - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
     - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit src\Symfony\Contracts
     - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
     - php composer.phar update --no-progress --no-suggest --ansi
diff --git a/.github/build-packages.php b/.github/build-packages.php
@@ -47,7 +47,7 @@
     if (isset($preferredInstall[$package->name]) && 'source' === $preferredInstall[$package->name]) {
         passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
     } else {
-        passthru("cd $dir && git init && git add . && git commit --author \"Symfony <>\" -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
+        passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
     }
 
     if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {
diff --git a/.travis.yml b/.travis.yml
@@ -202,6 +202,9 @@ install:
 
     - |
       # Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
+      git config --global user.email ""
+      git config --global user.name "Symfony"
+
       if [[ ! $deps ]]; then
           php .github/build-packages.php HEAD^ src/Symfony/Bridge/PhpUnit src/Symfony/Contracts
       else

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`if (isset($preferredInstall[$package->name]) && 'source' === $preferredInstall[$package->name]) {`
`48`	`48`	`passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");`
`49`	`49`	`} else {`
`50`		`- passthru("cd $dir && git init && git add . && git commit --author \"Symfony <>\" -m - && git archive -o package.tar HEAD && rm .git/ -Rf");`
	`50`	`+ passthru("cd $dir && git init && git add . && git commit -q -m - && git archive -o package.tar HEAD && rm .git/ -Rf");`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {`