From 3ba53e7d8c6372b8d4c14eaa1d5eff4fa8fc0a71 Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Thu, 6 Feb 2025 14:52:59 +0100 Subject: [PATCH 1/4] fix: Set sensible default for gitRootFolder for artifact based deployments --- src/Method/ArtifactsBaseMethod.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Method/ArtifactsBaseMethod.php b/src/Method/ArtifactsBaseMethod.php index bab9df2f..c61f4b71 100644 --- a/src/Method/ArtifactsBaseMethod.php +++ b/src/Method/ArtifactsBaseMethod.php @@ -93,7 +93,7 @@ protected function prepareDirectoriesAndStages( ) { $hash = md5(rand(0, PHP_INT_MAX) . '-' . time()); if ($use_local_repository = $host_config[self::PREFS_KEY]['useLocalRepository']) { - $install_dir = $host_config['gitRootFolder']; + $install_dir = $host_config['gitRootFolder'] ?? $host_config['rootFolder']; $stages = array_diff($stages, ['installCode']); } else { $install_dir = $host_config['tmpFolder'] . '/' . $host_config->getConfigName() . '-' . $hash; From efca2d1528e21acaa6daef0efcc7c75d6d048cfb Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Thu, 6 Feb 2025 14:53:35 +0100 Subject: [PATCH 2/4] chore(release): 3.8.36 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- src/Utilities/Utilities.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4768aa8a..bafcd21e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [3.8.36](https://github.com/factorial-io/phabalicious/compare/3.8.35...3.8.36) (2025-02-06) + + +### Bug Fixes + +* Set sensible default for gitRootFolder for artifact based deployments ([3ba53e7](https://github.com/factorial-io/phabalicious/commit/3ba53e7d8c6372b8d4c14eaa1d5eff4fa8fc0a71)) + ### [3.8.35](https://github.com/factorial-io/phabalicious/compare/3.8.34...3.8.35) (2024-12-03) diff --git a/package.json b/package.json index 6b17a363..3fbc9a9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phabalicious", - "version": "3.8.35", + "version": "3.8.36", "main": "index.js", "repository": "https://github.com/factorial-io/phabalicious.git", "author": "Stephan Huber ", diff --git a/src/Utilities/Utilities.php b/src/Utilities/Utilities.php index 51c92c07..3b7ce10a 100644 --- a/src/Utilities/Utilities.php +++ b/src/Utilities/Utilities.php @@ -13,7 +13,7 @@ class Utilities { - const FALLBACK_VERSION = '3.8.35'; + const FALLBACK_VERSION = '3.8.36'; const COMBINED_ARGUMENTS = 'combined'; const UNNAMED_ARGUMENTS = 'unnamedArguments'; From 8e4e966c1ccb6784404032a9959a8a53dc5e6d16 Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Thu, 6 Feb 2025 14:54:13 +0100 Subject: [PATCH 3/4] fix: Set sensible default for gitRootFolder for artifact based deployments --- src/Method/ArtifactsBaseMethod.php | 2 +- src/Method/ArtifactsGitMethod.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Method/ArtifactsBaseMethod.php b/src/Method/ArtifactsBaseMethod.php index c61f4b71..bab9df2f 100644 --- a/src/Method/ArtifactsBaseMethod.php +++ b/src/Method/ArtifactsBaseMethod.php @@ -93,7 +93,7 @@ protected function prepareDirectoriesAndStages( ) { $hash = md5(rand(0, PHP_INT_MAX) . '-' . time()); if ($use_local_repository = $host_config[self::PREFS_KEY]['useLocalRepository']) { - $install_dir = $host_config['gitRootFolder'] ?? $host_config['rootFolder']; + $install_dir = $host_config['gitRootFolder']; $stages = array_diff($stages, ['installCode']); } else { $install_dir = $host_config['tmpFolder'] . '/' . $host_config->getConfigName() . '-' . $hash; diff --git a/src/Method/ArtifactsGitMethod.php b/src/Method/ArtifactsGitMethod.php index da44cd62..01715289 100644 --- a/src/Method/ArtifactsGitMethod.php +++ b/src/Method/ArtifactsGitMethod.php @@ -100,6 +100,7 @@ public function getDefaultConfig(ConfigurationService $configuration_service, No ]; $return['deployMethod'] = 'git-sync'; + $return['gitRootFolder'] = $configuration_service->getFabfilePath(); return $parent->merge(new Node($return, $this->getName() . ' method defaults')); } From b363213e511f4c1964dd5719518975ccf5318b6c Mon Sep 17 00:00:00 2001 From: Stephan Huber Date: Thu, 6 Feb 2025 14:54:23 +0100 Subject: [PATCH 4/4] chore(release): 3.8.37 --- CHANGELOG.md | 7 +++++++ package.json | 2 +- src/Utilities/Utilities.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bafcd21e..776e3b63 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [3.8.37](https://github.com/factorial-io/phabalicious/compare/3.8.36...3.8.37) (2025-02-06) + + +### Bug Fixes + +* Set sensible default for gitRootFolder for artifact based deployments ([8e4e966](https://github.com/factorial-io/phabalicious/commit/8e4e966c1ccb6784404032a9959a8a53dc5e6d16)) + ### [3.8.36](https://github.com/factorial-io/phabalicious/compare/3.8.35...3.8.36) (2025-02-06) diff --git a/package.json b/package.json index 3fbc9a9b..1e98652d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "phabalicious", - "version": "3.8.36", + "version": "3.8.37", "main": "index.js", "repository": "https://github.com/factorial-io/phabalicious.git", "author": "Stephan Huber ", diff --git a/src/Utilities/Utilities.php b/src/Utilities/Utilities.php index 3b7ce10a..4ee39302 100644 --- a/src/Utilities/Utilities.php +++ b/src/Utilities/Utilities.php @@ -13,7 +13,7 @@ class Utilities { - const FALLBACK_VERSION = '3.8.36'; + const FALLBACK_VERSION = '3.8.37'; const COMBINED_ARGUMENTS = 'combined'; const UNNAMED_ARGUMENTS = 'unnamedArguments';