From f2d83c4ed144069077f78d7b49c2cd5e5b9e20ac Mon Sep 17 00:00:00 2001
From: rtm516 <rtm516@users.noreply.github.com>
Date: Sat, 27 May 2023 14:05:41 +0100
Subject: [PATCH] Fixed GitHub Action run numbers
---
core/build.gradle.kts | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index fd373baae..d45404450 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -97,7 +97,7 @@ configure<BlossomExtension> {
}
fun Project.buildNumber(): Int =
- System.getenv("BUILD_NUMBER")?.let { Integer.parseInt(it) } ?: -1
+ (System.getenv("GITHUB_RUN_NUMBER") ?: jenkinsBuildNumber())?.let { Integer.parseInt(it) } ?: -1
inner class GitInfo {
val branch: String
@@ -129,3 +129,6 @@ inner class GitInfo {
repository = git?.repository?.config?.getString("remote", "origin", "url") ?: ""
}
}
+
+// todo remove this when we're not using Jenkins anymore
+private fun jenkinsBuildNumber(): String? = System.getenv("BUILD_NUMBER")