From c8e7293757d0b17ed9051799e37e5faf23b1f7c9 Mon Sep 17 00:00:00 2001 From: vol4onok Date: Wed, 13 Dec 2023 21:51:17 +0200 Subject: [PATCH] SDK-5690: Cleanup integration.lock and add it into .gitignore --- bin/integrator | 2 +- src/IntegratorLock/IntegratorLockCleaner.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/integrator b/bin/integrator index a0020d35..aa14795e 100755 --- a/bin/integrator +++ b/bin/integrator @@ -3,7 +3,7 @@ defined('APPLICATION_ROOT_DIR') || define('APPLICATION_ROOT_DIR', getcwd() ); -defined('INTEGRATOR_ROOT_DIR') || define('INTEGRATOR_ROOT_DIR', dirname(__DIR__, 4) ); +defined('INTEGRATOR_ROOT_DIR') || define('INTEGRATOR_ROOT_DIR', dirname(__DIR__) ); defined('APPLICATION_SOURCE_DIR') || define('APPLICATION_SOURCE_DIR', APPLICATION_ROOT_DIR . DIRECTORY_SEPARATOR . 'src'); diff --git a/src/IntegratorLock/IntegratorLockCleaner.php b/src/IntegratorLock/IntegratorLockCleaner.php index 68f4cfc0..dd6b3f71 100644 --- a/src/IntegratorLock/IntegratorLockCleaner.php +++ b/src/IntegratorLock/IntegratorLockCleaner.php @@ -55,7 +55,7 @@ public function deleteLock(): void $this->processExecutor->execute([sprintf('echo %s >> %s', $this->config::INTEGRATOR_LOCK, static::GITIGNORE_FILE)]); $this->processExecutor->execute(['git', 'add', $lockFilePath]); - $this->processExecutor->execute(['git', 'commit', '-m', sprintf('Removed `%s` file.', $this->config::INTEGRATOR_LOCK)]); + $process = $this->processExecutor->execute(['git', 'commit', '-m', sprintf('Removed `%s` file.', $this->config::INTEGRATOR_LOCK), '-n']); } /**