Merge branch 'jenkins-integration'

aik099 · aik099 · commit acb955b35060 · 2024-10-17T16:31:48.000+03:00
* jenkins-integration:
  Removed trailing "/" in commit URLs submitted from Phabricator to Jenkins
diff --git a/src/applications/diffusion/conduit/DiffusionJenkinsHookAPIMethod.php b/src/applications/diffusion/conduit/DiffusionJenkinsHookAPIMethod.php
@@ -63,7 +63,7 @@ protected function execute(ConduitAPIRequest $request) {
       throw new ConduitException('ERR_BAD_COMMIT');
     }
 
-    $commit_url = PhabricatorEnv::getEnvConfig('phabricator.base-uri').
+    $commit_url = rtrim(PhabricatorEnv::getEnvConfig('phabricator.base-uri'), '/').
       $drequest->generateURI(array('action' => 'commit', 'stable' => true));
 
     $property = $this->getCommitProperty($commit, 'build-recorded');

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ protected function execute(ConduitAPIRequest $request) {`
`63`	`63`	`throw new ConduitException('ERR_BAD_COMMIT');`
`64`	`64`	`}`
`65`	`65`
`66`		`- $commit_url = PhabricatorEnv::getEnvConfig('phabricator.base-uri').`
	`66`	`+ $commit_url = rtrim(PhabricatorEnv::getEnvConfig('phabricator.base-uri'), '/').`
`67`	`67`	`$drequest->generateURI(array('action' => 'commit', 'stable' => true));`
`68`	`68`
`69`	`69`	`$property = $this->getCommitProperty($commit, 'build-recorded');`