diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index 7f3aa42d77eb..a1572ecb613a 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -16,6 +16,7 @@ use Codedge\Updater\UpdaterManager; use Composer\Factory; use Composer\IO\NullIO; use Composer\Installer; +use Cz\Git\GitRepository; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Support\Facades\Artisan; use Illuminate\Support\Facades\Storage; @@ -66,22 +67,29 @@ class SelfUpdateController extends BaseController return response()->json(['message' => 'Self update not available on this system.'], 403); } - info("is new version available = ". $updater->source()->isNewVersionAvailable()); - // Get the new version available - $versionAvailable = $updater->source()->getVersionAvailable(); + $repo = new GitRepository(base_path()); + //info($repo->getCurrentBranchName()); + $repo->pull('origin'); -info($versionAvailable); +// info("is new version available = ". $updater->source()->isNewVersionAvailable()); - // Create a release - $release = $updater->source()->fetch($versionAvailable); +// // Get the new version available +// $versionAvailable = $updater->source()->getVersionAvailable(); -info(print_r($release,1)); +// info($versionAvailable); - // Run the update process - $res = $updater->source()->update($release); +// // Create a release +// $release = $updater->source()->fetch($versionAvailable); -info(print_r($res,1)); +// info(print_r($release,1)); + +// // Run the update process +// $res = $updater->source()->update($release); + +// info(print_r($res,1)); + + Artisan::call('ninja:post-update'); Artisan::call('ninja:post-update'); diff --git a/composer.json b/composer.json index 3c3a629a8fc5..f2b386248b7f 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "cleverit/ubl_invoice": "^1.3", "codedge/laravel-selfupdater": "~3.0", "composer/composer": "^1.10", + "czproject/git-php": "^3.17", "dacastro4/laravel-gmail": "^3.2", "doctrine/dbal": "^2.10", "fedeisas/laravel-mail-css-inliner": "2.3",