Merge pull request #1 from joheintz/feature/fix_bamboo_build_number

TheSnoozer · web-flow · commit 7c9c75f33f72 · 2021-07-05T20:52:37.000+02:00
Add "bamboo_buildNumber" for loading the build number in BambooBuildServerData to avoid an empty bamboo build number
diff --git a/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java b/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java
@@ -43,7 +43,8 @@ public static boolean isActiveServer(Map<String, String> env) {
   @Override
   void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = Optional.ofNullable(env.get("bamboo.buildNumber"))
-            .orElseGet(() -> env.getOrDefault("BAMBOO_BUILDNUMBER", ""));
+            .or(() -> Optional.ofNullable(env.get("BAMBOO_BUILDNUMBER")))
+            .orElseGet(() -> env.getOrDefault("bamboo_buildNumber", ""));
 
     maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
   }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,8 @@ public static boolean isActiveServer(Map<String, String> env) {`
`43`	`43`	`@Override`
`44`	`44`	`void loadBuildNumber(@Nonnull Properties properties) {`
`45`	`45`	`String buildNumber = Optional.ofNullable(env.get("bamboo.buildNumber"))`
`46`		`- .orElseGet(() -> env.getOrDefault("BAMBOO_BUILDNUMBER", ""));`
	`46`	`+ .or(() -> Optional.ofNullable(env.get("BAMBOO_BUILDNUMBER")))`
	`47`	`+ .orElseGet(() -> env.getOrDefault("bamboo_buildNumber", ""));`
`47`	`48`
`48`	`49`	`maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);`
`49`	`50`	`}`