Fix broken versioning of nodehost builds

- museumsvictoria#314 (comment)
scroix · Apr 24, 2024 · 15b6416 · 15b6416
1 parent cb8d2a6
commit 15b6416
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -27,18 +27,20 @@ ext {
 
     branch = gitInfo.branch
     if (branch == 'master') {
-        branch = 'dev'
+        branch = 'release'
     } else if (branch.contains('/')) {
         branch = branch.substring(branch.indexOf('/') + 1)
     }
 
-    version = gitInfo.branch != 'stable' ? "${project.version}-${branch}_r${rev}" : project.version
+    baseVersion = '2.2.1'
+    versionIdentifier = "${baseVersion}-${branch}_r${rev}"
+    println "versionIdentifier: ${versionIdentifier}"
 }
 
 subprojects {
     apply plugin: 'java'
     group = 'org.nodel'
-    version = '2.2.1'
+    version = rootProject.ext.baseVersion
     repositories {
         mavenCentral()
     }

diff --git a/nodel-framework/build.gradle b/nodel-framework/build.gradle
@@ -5,14 +5,12 @@ apply plugin: 'eclipse'
 // some extended unicode is used in SimpleName
 compileJava.options.encoding = 'utf-8'
 
-version = rootProject.ext.gitInfo.branch != 'stable' ? "${project.version}-${rootProject.ext.branch}_r${rootProject.ext.rev}" : project.version
-
 jar {
     from "$buildDir/output"
     archiveBaseName = 'nodel-framework'
     manifest {
         attributes 'Implementation-Title': 'Nodel framework for Java',
-                'Implementation-Version': rootProject.ext.version
+                'Implementation-Version': rootProject.ext.versionIdentifier
     }
 }
 

diff --git a/nodel-webui-js/build.gradle b/nodel-webui-js/build.gradle
@@ -111,7 +111,7 @@ tasks.register('filterContentTemplates', Copy) {
             buildOrigin : rootProject.ext.gitInfo.origin.toString(),
             buildProject: project.name.toString(),
             buildBranch : rootProject.ext.branch.toString(),
-            buildVersion: rootProject.ext.version.toString(),
+            buildVersion: rootProject.ext.versionIdentifier.toString(),
             buildId     : rootProject.ext.buildSummary.toString(),
             buildRev    : rootProject.ext.rev.toString(),
             buildHost   : rootProject.ext.hostname.toString(),