Merge remote-tracking branch 'upstream/master'
Conflicts: composer.json
This commit is contained in:
commit
287a2b3632
49 changed files with 600 additions and 1032 deletions
|
|
@ -74,7 +74,14 @@ class RemoteGitBuild extends Build
|
|||
protected function cloneBySsh(Builder $builder, $to)
|
||||
{
|
||||
// Copy the project's keyfile to disk:
|
||||
$keyFile = realpath($to) . '.key';
|
||||
$keyPath = realpath($to);
|
||||
|
||||
if ($keyPath === false) {
|
||||
$keyPath = dirname($to);
|
||||
}
|
||||
|
||||
$keyFile = $keyPath . '.key';
|
||||
|
||||
file_put_contents($keyFile, $this->getProject()->getGitKey());
|
||||
chmod($keyFile, 0600);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue