Fix Jenkins Build Take 2

This commit is contained in:
2023-05-28 21:55:09 +02:00
parent 435b9cbd58
commit 320a5966a5

View File

@@ -13,24 +13,22 @@ registrationUtils {
} }
} }
def version_base = "${project.version_major}.${project.version_minor}"
version = "${version_base}.${project.version_patch}"
subprojects {
ext { ext {
isSnapshot = false release = project.properties['release'] ?: false
} }
version = "${version_base}.${project.version_patch}" def version_base = "${project.version_major}.${project.version_minor}"
def final_ver = "${version_base}.${project.version_patch}"
group = project.group
// Jenkins // Jenkins
if (System.getenv('BUILD_NUMBER') != null) { if (System.getenv('BUILD_NUMBER') != null && project.release == false) {
project.isSnapshot = true final_ver = version_base + "." + System.getenv('BUILD_NUMBER') + "d"
version = version_base + "." + System.getenv('BUILD_NUMBER') + "d"
} }
subprojects {
version = "${final_ver}"
group = project.group
apply plugin: 'java' apply plugin: 'java'
java.toolchain.languageVersion = JavaLanguageVersion.of(17) java.toolchain.languageVersion = JavaLanguageVersion.of(17)
@@ -145,7 +143,7 @@ publishing {
repositories { repositories {
maven { maven {
url "https://maven.firstdarkdev.xyz/" + (project.isSnapshot ? "snapshots" : "releases") url "https://maven.firstdarkdev.xyz/" + (project.release ? "snapshots" : "releases")
credentials { credentials {
username System.getenv("MAVEN_USER") username System.getenv("MAVEN_USER")
password System.getenv("MAVEN_PASS") password System.getenv("MAVEN_PASS")