dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: use commit hash on webhooks

Browse Source
This commit is contained in:
Andras Bacsai
2024-05-15 10:44:45 +02:00
parent 0ffba45517
commit 1e09b2bbd8
4 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Webhook/Bitbucket.php
View File

@@ -47,7 +47,7 @@ class Bitbucket extends Controller
if ($x_bitbucket_event === 'repo:push') { if ($x_bitbucket_event === 'repo:push') {
$branch = data_get($payload, 'push.changes.0.new.name'); $branch = data_get($payload, 'push.changes.0.new.name');
$full_name = data_get($payload, 'repository.full_name'); $full_name = data_get($payload, 'repository.full_name');
$commit = data_get($payload, 'push.changes.0.new.target.hash');
if (!$branch) { if (!$branch) {
return response([ return response([
'status' => 'failed', 'status' => 'failed',
@@ -104,6 +104,7 @@ class Bitbucket extends Controller
queue_application_deployment( queue_application_deployment(
application: $application, application: $application,
deployment_uuid: $deployment_uuid, deployment_uuid: $deployment_uuid,
commit: $commit,
force_rebuild: false, force_rebuild: false,
is_webhook: true is_webhook: true
); );

4
app/Http/Controllers/Webhook/Github.php
View File

@@ -129,6 +129,7 @@ class Github extends Controller
application: $application, application: $application,
deployment_uuid: $deployment_uuid, deployment_uuid: $deployment_uuid,
force_rebuild: false, force_rebuild: false,
commit: data_get($payload, 'after', 'HEAD'),
is_webhook: true, is_webhook: true,
); );
$return_payloads->push([ $return_payloads->push([
@@ -177,6 +178,7 @@ class Github extends Controller
pull_request_id: $pull_request_id, pull_request_id: $pull_request_id,
deployment_uuid: $deployment_uuid, deployment_uuid: $deployment_uuid,
force_rebuild: false, force_rebuild: false,
commit: data_get($payload, 'head.sha', 'HEAD'),
is_webhook: true, is_webhook: true,
git_type: 'github' git_type: 'github'
); );
@@ -338,6 +340,7 @@ class Github extends Controller
queue_application_deployment( queue_application_deployment(
application: $application, application: $application,
deployment_uuid: $deployment_uuid, deployment_uuid: $deployment_uuid,
commit: data_get($payload, 'after', 'HEAD'),
force_rebuild: false, force_rebuild: false,
is_webhook: true, is_webhook: true,
); );
@@ -387,6 +390,7 @@ class Github extends Controller
pull_request_id: $pull_request_id, pull_request_id: $pull_request_id,
deployment_uuid: $deployment_uuid, deployment_uuid: $deployment_uuid,
force_rebuild: false, force_rebuild: false,
commit: data_get($payload, 'head.sha', 'HEAD'),
is_webhook: true, is_webhook: true,
git_type: 'github' git_type: 'github'
); );

2
app/Http/Controllers/Webhook/Gitlab.php
View File

@@ -133,6 +133,7 @@ class Gitlab extends Controller
queue_application_deployment( queue_application_deployment(
application: $application, application: $application,
deployment_uuid: $deployment_uuid, deployment_uuid: $deployment_uuid,
commit: data_get($payload, 'after', 'HEAD'),
force_rebuild: false, force_rebuild: false,
is_webhook: true, is_webhook: true,
); );
@@ -182,6 +183,7 @@ class Gitlab extends Controller
application: $application, application: $application,
pull_request_id: $pull_request_id, pull_request_id: $pull_request_id,
deployment_uuid: $deployment_uuid, deployment_uuid: $deployment_uuid,
commit: data_get($payload, 'object_attributes.last_commit.id', 'HEAD'),
force_rebuild: false, force_rebuild: false,
is_webhook: true, is_webhook: true,
git_type: 'gitlab' git_type: 'gitlab'

2
app/Jobs/ApplicationDeploymentJob.php
View File

@@ -1113,6 +1113,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
} }
if ($this->saved_outputs->get('git_commit_sha') && !$this->rollback) { if ($this->saved_outputs->get('git_commit_sha') && !$this->rollback) {
$this->commit = $this->saved_outputs->get('git_commit_sha')->before("\t"); $this->commit = $this->saved_outputs->get('git_commit_sha')->before("\t");
$this->application_deployment_queue->commit = $this->commit;
$this->application_deployment_queue->save();
} }
} }
private function clone_repository() private function clone_repository()