From 6272f62e859f19b6d8b5911d8a197ed5a7bb9e3f Mon Sep 17 00:00:00 2001 From: carodej Date: Sat, 16 May 2020 17:22:45 +0200 Subject: [PATCH] v1.5-alpha.6 --- app/Console/Commands/Deploy.php | 2 +- composer.json | 1 - config/app.php | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Console/Commands/Deploy.php b/app/Console/Commands/Deploy.php index ee72aba5..2ba18751 100644 --- a/app/Console/Commands/Deploy.php +++ b/app/Console/Commands/Deploy.php @@ -42,7 +42,7 @@ class Deploy extends Command $this->call('down'); // Exec commands - exec('git pull origin dev'); + exec('git pull origin ' . config('app.deploy_branch')); exec('composer update --no-interaction --prefer-dist'); $this->migrateDatabase(); diff --git a/composer.json b/composer.json index 3f2035e1..96621022 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "laravel/tinker": "^2.0", "league/flysystem-aws-s3-v3": "^1.0", "league/flysystem-cached-adapter": "^1.0", - "symfony/process": "^5.0", "teamtnt/laravel-scout-tntsearch-driver": "^7.2" }, "require-dev": { diff --git a/config/app.php b/config/app.php index cebb036e..c8c8a019 100644 --- a/config/app.php +++ b/config/app.php @@ -234,6 +234,7 @@ return [ ], 'deploy_secret' => env('APP_DEPLOY_SECRET'), + 'deploy_branch' => env('APP_DEPLOY_BRANCH'), 'debug_blacklist' => [ '_ENV' => [