diff --git a/Harbormaster-Teamcity-Plugin/HarbormasterTeamCityBuildStepImplementation.php b/Harbormaster-Teamcity-Plugin/HarbormasterTeamCityBuildStepImplementation.php index 122b63c..9b347c3 100644 --- a/Harbormaster-Teamcity-Plugin/HarbormasterTeamCityBuildStepImplementation.php +++ b/Harbormaster-Teamcity-Plugin/HarbormasterTeamCityBuildStepImplementation.php @@ -59,7 +59,7 @@ final class HarbormasterTeamCityBuildStepImplementation $xmlBuilder = new TeamCityXmlBuildBuilder(); $payload = $xmlBuilder ->addBuildId($settings['buildId']) - ->addBranchName(implode(array("D", $variables['buildable.revision'], "-", $variables['build.id']))) + ->addRevisionBuild(implode(array("D", $variables['buildable.revision'], "-", $variables['buildable.diff']))) ->addPhabBuildId($variables['build.id']) ->addDiffId($variables['buildable.diff']) ->addHarbormasterPHID($variables['target.phid']) diff --git a/Harbormaster-Teamcity-Plugin/TeamCityXmlBuildBuilder.php b/Harbormaster-Teamcity-Plugin/TeamCityXmlBuildBuilder.php index 477143a..f7c4968 100644 --- a/Harbormaster-Teamcity-Plugin/TeamCityXmlBuildBuilder.php +++ b/Harbormaster-Teamcity-Plugin/TeamCityXmlBuildBuilder.php @@ -33,11 +33,8 @@ final class TeamCityXmlBuildBuilder { return $this; } - function addBranchName($branchName){ - // $this-> - // root-> - // setAttribute('branchName', $branchName); - $this->addProperty("phabricator.BRANCH_NAME", $branchName); + function addRevisionBuild($revisionBuild){ + $this->addProperty("phabricator.REVISION_BUILD", $revisionBuild); return $this; } diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/Constants.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/Constants.java index f5d56b5..06b8565 100644 --- a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/Constants.java +++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/Constants.java @@ -11,7 +11,6 @@ public class Constants { public static final String PHABRICATOR_CONDUIT_TOKEN_SETTING = "plugin.conduitToken"; // Build Config - public static final String BRANCH_NAME = "phabricator.BRANCH_NAME"; public static final String BUILD_ID = "phabricator.BUILD_ID"; public static final String DIFF_ID = "phabricator.DIFF_ID"; public static final String HARBORMASTER_PHID = "phabricator.HARBORMASTER_TARGET_PHID"; diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java index 9ddc12c..9ec6cfb 100644 --- a/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java +++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-common/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorPluginConfig.java @@ -23,7 +23,6 @@ public class PhabricatorPluginConfig { private String conduitToken; // Harbormaster Variables - private String branchName; private String buildId; private String diffId; private String harbormasterPHID; @@ -67,10 +66,6 @@ public class PhabricatorPluginConfig { logger.info("Found Phabricator Conduit Token"); conduitToken = params.get(Constants.PHABRICATOR_CONDUIT_TOKEN_SETTING); break; - case Constants.BRANCH_NAME: - logger.info(String.format("Found branch name: %s", params.get(Constants.BRANCH_NAME))); - branchName = params.get(Constants.BRANCH_NAME); - break; case Constants.BUILD_ID: logger.info(String.format("Found build id: %s", params.get(Constants.BUILD_ID))); buildId = params.get(Constants.BUILD_ID); @@ -97,7 +92,7 @@ public class PhabricatorPluginConfig { } public boolean isPluginSetup() { - if (!isNull(phabricatorUrl) && !isNullOrEmpty(branchName) && !isNullOrEmpty(buildId) && !isNullOrEmpty(diffId) + if (!isNull(phabricatorUrl) && !isNullOrEmpty(buildId) && !isNullOrEmpty(diffId) && !isNullOrEmpty(harbormasterPHID) && !isNullOrEmpty(revisionId)) { return true; } diff --git a/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorBuildStartContextProcessor.java b/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorBuildStartContextProcessor.java index 305a5ec..3b246a6 100644 --- a/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorBuildStartContextProcessor.java +++ b/Teamcity-Phabricator-Plugin/phabricator-plugin-server/src/main/java/uk/xlab/teamcity/phabricator/PhabricatorBuildStartContextProcessor.java @@ -13,10 +13,6 @@ public class PhabricatorBuildStartContextProcessor implements BuildStartContextP // agent Map parameters = context.getBuild().getBuildOwnParameters(); - if (parameters.containsKey(Constants.BRANCH_NAME)) { - context.addSharedParameter(Constants.BRANCH_NAME, parameters.get(Constants.BRANCH_NAME)); - } - if (parameters.containsKey(Constants.BUILD_ID)) { context.addSharedParameter(Constants.BUILD_ID, parameters.get(Constants.BUILD_ID)); }