From 36e8c52b01bfb6702a52ddef6a6eefb6eb5cf403 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 16 May 2024 17:21:53 +0200 Subject: [PATCH 1/3] Update version numbers to 4.0.0-beta.280 --- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/sentry.php b/config/sentry.php index 99658ff75..0f7ae133f 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.279', + 'release' => '4.0.0-beta.280', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 373aa74bb..651fec610 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Thu, 16 May 2024 17:22:32 +0200 Subject: [PATCH 2/3] fix: commit message length --- app/Jobs/ApplicationDeploymentJob.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index e542a67b4..9270b648a 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -1179,12 +1179,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted ] ); if ($this->saved_outputs->get('commit_message')) { - $commit_message = str($this->saved_outputs->get('commit_message'))->limit(50); + $commit_message = str($this->saved_outputs->get('commit_message'))->limit(47); $this->application_deployment_queue->commit_message = $commit_message->value(); ApplicationDeploymentQueue::whereCommit($this->commit)->whereApplicationId($this->application->id)->update( ['commit_message' => $commit_message->value()] ); - $this->application_deployment_queue->save(); } } From ed9cdc1ab77b15edbc1773842cd6c0d857e49705 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 16 May 2024 17:24:57 +0200 Subject: [PATCH 3/3] Fix issue with parsing services in ScheduledTask/All.php --- app/Livewire/Project/Shared/ScheduledTask/All.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Livewire/Project/Shared/ScheduledTask/All.php b/app/Livewire/Project/Shared/ScheduledTask/All.php index 5182639d7..e5ea66d13 100644 --- a/app/Livewire/Project/Shared/ScheduledTask/All.php +++ b/app/Livewire/Project/Shared/ScheduledTask/All.php @@ -23,7 +23,7 @@ class All extends Component } elseif ($this->resource->type() == 'application') { if ($this->resource->build_pack === 'dockercompose') { $parsed = $this->resource->parseCompose(); - $containers = collect($parsed['services'])->keys(); + $containers = collect(data_get($parsed,'services'))->keys(); $this->containerNames = $containers; } else { $this->containerNames = collect([]);