From 4bb29e7396ab8aaffc6e4f2fe6ad8cbfc2ffb166 Mon Sep 17 00:00:00 2001 From: Dane Powell Date: Wed, 18 Sep 2024 11:46:14 -0700 Subject: [PATCH] CLI-1388: Deprecate source-git-tag --- src/Command/Push/PushArtifactCommand.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Command/Push/PushArtifactCommand.php b/src/Command/Push/PushArtifactCommand.php index 01e504a59..f4c0246c2 100644 --- a/src/Command/Push/PushArtifactCommand.php +++ b/src/Command/Push/PushArtifactCommand.php @@ -52,8 +52,8 @@ protected function configure(): void ->addOption('no-clone', null, InputOption::VALUE_NONE, 'Do not clone repository. Implies no-commit and no-push') ->addOption('destination-git-urls', 'u', InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED, 'The URL of your git repository to which the artifact branch will be pushed. Use multiple times for multiple URLs.') ->addOption('destination-git-branch', 'b', InputOption::VALUE_REQUIRED, 'The destination branch to push the artifact to') - ->addOption('destination-git-tag', 't', InputOption::VALUE_REQUIRED, 'The destination tag to push the artifact to. Using this option requires also using the --source-git-tag option') - ->addOption('source-git-tag', 's', InputOption::VALUE_REQUIRED, 'The source tag from which to create the tag artifact') + ->addOption('destination-git-tag', 't', InputOption::VALUE_REQUIRED, 'The destination tag to push the artifact to. Using this option requires also using the --destination-git-branch option') + ->addOption('source-git-tag', 's', InputOption::VALUE_REQUIRED, 'Deprecated: Use destination-git-branch instead') ->acceptEnvironmentId() ->setHelp('This command builds a sanitized deploy artifact by running composer install, removing sensitive files, and committing vendor directories.' . PHP_EOL . PHP_EOL . 'Vendor directories and scaffold files are committed to the build artifact even if they are ignored in the source repository.' . PHP_EOL . PHP_EOL @@ -476,6 +476,9 @@ private function determineSourceGitRef(): string if ($envVar = getenv('ACLI_PUSH_ARTIFACT_SOURCE_GIT_TAG')) { return $envVar; } + if ($this->input->getOption('destination-git-branch')) { + return $this->input->getOption('destination-git-branch'); + } if ($this->input->getOption('destination-git-tag')) { throw new AcquiaCliException('You must also set the --source-git-tag option when setting the --destination-git-tag option.'); }