Fix auto-deployment branch (#506)

This commit is contained in:
Saeed Vaziry
2025-02-23 12:50:46 +01:00
committed by GitHub
parent 1223ea1499
commit e99146209e
6 changed files with 189 additions and 13 deletions

View File

@ -29,7 +29,8 @@ public function __invoke(Request $request)
->firstOrFail();
foreach ($gitHook->actions as $action) {
if ($action == 'deploy') {
$webhookBranch = $gitHook->site->sourceControl->provider()->getWebhookBranch($request->array());
if ($action == 'deploy' && $gitHook->site->branch === $webhookBranch) {
try {
app(Deploy::class)->run($gitHook->site);
} catch (SourceControlIsNotConnected) {

View File

@ -70,4 +70,9 @@ protected function handleResponseErrors(Response $res, string $repo): void
throw new RepositoryPermissionDenied($repo);
}
}
public function getWebhookBranch(array $payload): string
{
return str($payload['ref'] ?? '')->after('refs/heads/')->toString();
}
}

View File

@ -183,4 +183,9 @@ private function getAuthenticationHeaders(): array
'Authorization' => 'Basic '.$basicAuth,
];
}
public function getWebhookBranch(array $payload): string
{
return data_get($payload, 'push.changes.0.new.name', 'default-branch');
}
}

View File

@ -176,4 +176,9 @@ public function getApiUrl(): string
return $host.$this->apiVersion;
}
public function getWebhookBranch(array $payload): string
{
return $payload['ref'] ?? '';
}
}

View File

@ -36,4 +36,6 @@ public function getLastCommit(string $repo, string $branch): ?array;
* @throws FailedToDeployGitKey
*/
public function deployKey(string $title, string $repo, string $key): void;
public function getWebhookBranch(array $payload): string;
}