OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 15:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity

Only include build time in manifest for numbered builds

Browse source
This commit is contained in:
Jason Penilla 2024-12-17 19:41:47 -08:00
parent c55ad7092c
commit e97bf6933c
No known key found for this signature in database
GPG key ID: 0E75A301420E48F8
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
paper-server/build.gradle.kts
View file

@ -181,12 +181,12 @@ dependencies {
// Paper end - spark // Paper end - spark
} }
tasks.jar { tasks.jar {
manifest { manifest {
val git = Git(rootProject.layout.projectDirectory.path) val git = Git(rootProject.layout.projectDirectory.path)
val mcVersion = rootProject.providers.gradleProperty("mcVersion").get() val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
val build = System.getenv("BUILD_NUMBER") ?: null val build = System.getenv("BUILD_NUMBER") ?: null
val buildTime = if (build != null) Instant.now() else Instant.EPOCH
val gitHash = git.exec(providers, "rev-parse", "--short=7", "HEAD").get().trim() val gitHash = git.exec(providers, "rev-parse", "--short=7", "HEAD").get().trim()
val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash" val implementationVersion = "$mcVersion-${build ?: "DEV"}-$gitHash"
val date = git.exec(providers, "show", "-s", "--format=%ci", gitHash).get().trim() // Paper val date = git.exec(providers, "show", "-s", "--format=%ci", gitHash).get().trim() // Paper
@ -202,7 +202,7 @@ tasks.jar {
"Brand-Id" to "papermc:paper", "Brand-Id" to "papermc:paper",
"Brand-Name" to "Paper", "Brand-Name" to "Paper",
"Build-Number" to (build ?: ""), "Build-Number" to (build ?: ""),
"Build-Time" to Instant.now().toString(), "Build-Time" to buildTime.toString(),
"Git-Branch" to gitBranch, // Paper "Git-Branch" to gitBranch, // Paper
"Git-Commit" to gitHash, // Paper "Git-Commit" to gitHash, // Paper
) )