Skip to content

Commit 150a504

Browse files
committed
TASK: Flip merging additionalvariables to make sure essential variables are set
1 parent 2e4e038 commit 150a504

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Classes/ContentReleaseManager.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ public function startIncrementalContentRelease(string $currentContentReleaseId =
5656
$contentReleaseId = ContentReleaseIdentifier::create();
5757
// the currentContentReleaseId is not used in any pipeline step in this package, but is a common need in other
5858
// use cases in extensions, e.g. calculating the differences between current and new release
59-
$this->prunnerApiService->schedulePipeline(PipelineName::create('do_content_release'), array_merge([
59+
$this->prunnerApiService->schedulePipeline(PipelineName::create('do_content_release'), array_merge($additionalVariables, [
6060
'contentReleaseId' => $contentReleaseId,
6161
'currentContentReleaseId' => $currentContentReleaseId ?: self::NO_PREVIOUS_RELEASE,
6262
'validate' => true,
6363
'workspaceName' => $workspace ? $workspace->getName() : 'live',
64-
], $additionalVariables));
64+
]));
6565
return $contentReleaseId;
6666
}
6767

@@ -75,12 +75,12 @@ public function startFullContentRelease(bool $validate = true, string $currentCo
7575

7676
$contentReleaseId = ContentReleaseIdentifier::create();
7777
$this->contentCache->flush();
78-
$this->prunnerApiService->schedulePipeline(PipelineName::create('do_content_release'), array_merge([
78+
$this->prunnerApiService->schedulePipeline(PipelineName::create('do_content_release'), array_merge($additionalVariables, [
7979
'contentReleaseId' => $contentReleaseId,
8080
'currentContentReleaseId' => $currentContentReleaseId ?: self::NO_PREVIOUS_RELEASE,
8181
'validate' => $validate,
8282
'workspaceName' => $workspace ? $workspace->getName() : 'live',
83-
], $additionalVariables));
83+
]));
8484
return $contentReleaseId;
8585
}
8686

0 commit comments

Comments
 (0)