646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
diff --git a/build.gradle.kts b/build.gradle.kts
|
|
index 79534cdf..4f298e66 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -1,3 +1,2 @@
|
|
plugins {
|
|
- id("org.ajoberstar.grgit")
|
|
}
|
|
diff --git a/server/desktop/build.gradle.kts b/server/desktop/build.gradle.kts
|
|
index 9ebb84a7..6130e45f 100644
|
|
--- a/server/desktop/build.gradle.kts
|
|
+++ b/server/desktop/build.gradle.kts
|
|
@@ -13,7 +13,6 @@ plugins {
|
|
application
|
|
id("com.gradleup.shadow")
|
|
id("com.github.gmazzo.buildconfig")
|
|
- id("org.ajoberstar.grgit")
|
|
}
|
|
|
|
kotlin {
|
|
@@ -86,12 +85,10 @@ buildConfig {
|
|
useKotlinOutput { topLevelConstants = true }
|
|
packageName("dev.slimevr.desktop")
|
|
|
|
- val gitVersionTag = providers.exec {
|
|
- commandLine("git", "--no-pager", "tag", "--sort", "-taggerdate", "--points-at", "HEAD")
|
|
- }.standardOutput.asText.get().split('\n').first()
|
|
- buildConfigField("String", "GIT_COMMIT_HASH", "\"${grgit.head().abbreviatedId}\"")
|
|
+ val gitVersionTag = "@version@"
|
|
+ buildConfigField("String", "GIT_COMMIT_HASH", "\"NOT AVAILABLE\"")
|
|
buildConfigField("String", "GIT_VERSION_TAG", "\"${gitVersionTag.trim()}\"")
|
|
- buildConfigField("boolean", "GIT_CLEAN", grgit.status().isClean.toString())
|
|
+ buildConfigField("boolean", "GIT_CLEAN", "true")
|
|
}
|
|
|
|
tasks.run<JavaExec> {
|