Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into blt-5222
Browse files Browse the repository at this point in the history
  • Loading branch information
danepowell committed Oct 23, 2023
2 parents 4b4cfd1 + 3f7cbb4 commit 877ca26
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
24 changes: 12 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Command/Push/PushArtifactCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,13 @@ private function buildArtifact(Closure $outputCallback, string $artifactDir): vo
// @see https://git.drupalcode.org/project/drupal/-/blob/9.1.x/sites/default/default.settings.php#L295
$outputCallback('out', "Mirroring source files from $this->dir to $artifactDir");
$originFinder = $this->localMachineHelper->getFinder();
$originFinder->files()->in($this->dir)
$originFinder->in($this->dir)
// Include dot files like .htaccess.
->ignoreDotFiles(FALSE)
// Ignore VCS ignored files (e.g. vendor) to speed up the mirror (Composer will restore them later).
->ignoreVCSIgnored(TRUE);
$targetFinder = $this->localMachineHelper->getFinder();
$targetFinder->files()->in($artifactDir)->ignoreDotFiles(FALSE);
$targetFinder->in($artifactDir)->ignoreDotFiles(FALSE);
$this->localMachineHelper->getFilesystem()->mirror($this->dir, $artifactDir, $originFinder, ['override' => TRUE, 'delete' => TRUE], $targetFinder);

$this->localMachineHelper->checkRequiredBinariesExist(['composer']);
Expand Down

0 comments on commit 877ca26

Please sign in to comment.