Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 0bc6b91cf98f · 2019-09-21T10:01:39.000+02:00
* 4.3:
  [travis] honor .gitattributes when building local packages
diff --git a/.github/build-packages.php b/.github/build-packages.php
@@ -17,6 +17,7 @@
 
 $packages = array();
 $flags = JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+$preferredInstall = json_decode(file_get_contents(__DIR__.'/composer-config.json'), true)['config']['preferred-install'];
 
 foreach ($dirs as $k => $dir) {
     if (!system("git diff --name-only $mergeBase -- $dir", $exitStatus)) {
@@ -42,7 +43,12 @@
         $json = rtrim(json_encode(array('repositories' => $package->repositories), $flags), "\n}").','.substr($json, 1);
         file_put_contents($dir.'/composer.json', $json);
     }
-    passthru("cd $dir && tar -cf package.tar --exclude='package.tar' *");
+
+    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 -m - && git archive -o package.tar HEAD && rm .git/ -Rf");
+    }
 
     if (!isset($package->extra->{'branch-alias'}->{'dev-master'})) {
         echo "Missing \"dev-master\" branch-alias in composer.json extra.\n";
