Merge pull request #3 from markusstephanides/main

Add feature branch support
jorgenpt · Jan 7, 2024 · 15b99a8 · 15b99a8
2 parents 3204656 + fc0bd1c
commit 15b99a8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/no/tjer/teamcity/ugsStatusPublisher/UgsStatusPublisher.kt b/src/main/java/no/tjer/teamcity/ugsStatusPublisher/UgsStatusPublisher.kt
@@ -105,7 +105,11 @@ internal class UgsStatusPublisher(
         val commitStatusUrl = MessageFormat.format(POST_BADGE_URL_FORMAT, myParams[UgsConstants.SERVER_URL])
         val body = JSONObject()
         // TODO: Try parse?
-        body.put("ChangeNumber", revision.revision.toInt(10))
+
+        // This will return the changelist number if using feature branches (e.g. "main|123" -> 123)
+        // or only the changelist number if not using feature branches ("123" -> 123)
+        val changeNumber = revision.revision.split("|").last().toInt(10)
+        body.put("ChangeNumber", changeNumber)
         body.put("Project", myParams[UgsConstants.PROJECT])
         body.put("BuildType", myParams[UgsConstants.BADGE_NAME])
         body.put("Result", status.result.uGSValue)