GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Fix git branch on Jenkins (#3286)

This commit is contained in:
Konicai 2022-09-15 20:32:38 -04:00 committed by GitHub
parent 83be01958f
commit 0aa7411d02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/build.gradle.kts
View File

@ -79,7 +79,8 @@ configure<BlossomExtension> {
val indra = the<IndraGitExtension>()
val mainFile = "src/main/java/org/geysermc/geyser/GeyserImpl.java"
val branchName = indra.branchName() ?: "DEV"
// On Jenkins, a detached head is checked out, so indra cannot determine the branch. Fortunately, this environment variable is available.
val branchName = indra.branchName() ?: System.getenv("GIT_BRANCH") ?: "DEV"
val commit = indra.commit()
val git = indra.git()
val gitVersion = "git-${branchName}-${commit?.name?.substring(0, 7) ?: "0000000"}"
@ -93,4 +94,4 @@ configure<BlossomExtension> {
}
fun Project.buildNumber(): Int =
Integer.parseInt(System.getenv("BUILD_NUMBER") ?: "-1")
Integer.parseInt(System.getenv("BUILD_NUMBER") ?: "-1")