Version tag may only be applied when all projects are "clean".

mnlipp · Jun 27, 2024 · e3da87d · e3da87d
1 parent b74de67
commit e3da87d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,8 @@ buildscript {
 plugins {
     id 'org.ajoberstar.grgit' version '5.2.0' apply false
     id 'org.ajoberstar.git-publish' version '4.2.0' apply false
-    id 'pl.allegro.tech.build.axion-release' version '1.15.0' apply false
+    id 'pl.allegro.tech.build.axion-release' version '1.17.2' apply false
+    id 'org.jdrupes.vmoperator.versioning-conventions'
     id 'org.jdrupes.vmoperator.java-doc-conventions'
     id 'eclipse'
     id "com.github.node-gradle.node" version "7.0.1"

diff --git a/org.jdrupes.vmoperator.manager/build.gradle b/org.jdrupes.vmoperator.manager/build.gradle
@@ -47,6 +47,7 @@ application {
 
 project.ext.gitBranch = grgit.branch.current.name.replace('/', '-')
 def registry = "${project.rootProject.properties['docker.registry']}"
+def rootVersion = rootProject.version
 
 task buildImage(type: Exec) {
     dependsOn installDist
@@ -70,7 +71,7 @@ task pushImage(type: Exec) {
 task tagWithVersion(type: Exec) {
     dependsOn pushImage
 
-    enabled = !project.version.contains("SNAPSHOT")
+    enabled = !rootVersion.contains("SNAPSHOT")
 
     commandLine 'podman', 'push', \
         "${project.name}:${project.gitBranch}",\
@@ -80,9 +81,9 @@ task tagWithVersion(type: Exec) {
 task tagAsLatest(type: Exec) {
     dependsOn tagWithVersion
 
-    enabled = !project.version.contains("SNAPSHOT")
-        && !project.version.contains("alpha") \
-        && !project.version.contains("beta") \
+    enabled = !rootVersion.contains("SNAPSHOT")
+        && !rootVersion.contains("alpha") \
+        && !rootVersion.contains("beta") \
         || project.rootProject.properties['docker.testRegistry'] \
             && project.rootProject.properties['docker.registry'] \
             == project.rootProject.properties['docker.testRegistry']

diff --git a/org.jdrupes.vmoperator.runner.qemu/build.gradle b/org.jdrupes.vmoperator.runner.qemu/build.gradle
@@ -33,6 +33,7 @@ application {
 
 project.ext.gitBranch = grgit.branch.current.name.replace('/', '-')
 def registry = "${project.rootProject.properties['docker.registry']}"
+def rootVersion = rootProject.version
 
 task buildImageArch(type: Exec) {
     dependsOn installDist
@@ -54,7 +55,7 @@ task pushImageArch(type: Exec) {
 task tagWithVersionArch(type: Exec) {
     dependsOn pushImageArch
 
-    enabled = !project.version.contains("SNAPSHOT")
+    enabled = !rootVersion.contains("SNAPSHOT")
 
     commandLine 'podman', 'push', \
         "${project.name}-arch:${project.gitBranch}",\
@@ -64,9 +65,9 @@ task tagWithVersionArch(type: Exec) {
 task tagAsLatestArch(type: Exec) {
     dependsOn tagWithVersionArch
 
-    enabled = !project.version.contains("SNAPSHOT")
-        && !project.version.contains("alpha") \
-        && !project.version.contains("beta") \
+    enabled = !rootVersion.contains("SNAPSHOT")
+        && !rootVersion.contains("alpha") \
+        && !rootVersion.contains("beta") \
         || project.rootProject.properties['docker.testRegistry'] \
             && project.rootProject.properties['docker.registry'] \
             == project.rootProject.properties['docker.testRegistry']
@@ -96,7 +97,7 @@ task pushImageAlpine(type: Exec) {
 task tagWithVersionAlpine(type: Exec) {
     dependsOn pushImageAlpine
 
-    enabled = !project.version.contains("SNAPSHOT")
+    enabled = !rootVersion.contains("SNAPSHOT")
 
     commandLine 'podman', 'push', \
         "${project.name}-alpine:${project.gitBranch}",\
@@ -106,9 +107,9 @@ task tagWithVersionAlpine(type: Exec) {
 task tagAsLatestAlpine(type: Exec) {
     dependsOn tagWithVersionAlpine
 
-    enabled = !project.version.contains("SNAPSHOT")
-        && !project.version.contains("alpha") \
-        && !project.version.contains("beta") \
+    enabled = !rootVersion.contains("SNAPSHOT")
+        && !rootVersion.contains("alpha") \
+        && !rootVersion.contains("beta") \
         || project.rootProject.properties['docker.testRegistry'] \
             && project.rootProject.properties['docker.registry'] \
             == project.rootProject.properties['docker.testRegistry']

diff --git a/spice-squid/build.gradle b/spice-squid/build.gradle
@@ -7,6 +7,7 @@ dependencies {
 
 project.ext.gitBranch = grgit.branch.current.name.replace('/', '-')
 def registry = "${project.rootProject.properties['docker.registry']}"
+def rootVersion = rootProject.version
 
 task buildImage(type: Exec) {
     inputs.files 'Containerfile'
@@ -26,7 +27,7 @@ task pushImage(type: Exec) {
 task tagWithVersion(type: Exec) {
     dependsOn pushImage
 
-    enabled = !project.version.contains("SNAPSHOT")
+    enabled = !rootVersion.contains("SNAPSHOT")
 
     commandLine 'podman', 'push', \
         "${project.name}:${project.gitBranch}",\
@@ -36,9 +37,9 @@ task tagWithVersion(type: Exec) {
 task tagAsLatest(type: Exec) {
     dependsOn tagWithVersion
 
-    enabled = !project.version.contains("SNAPSHOT")
-        && !project.version.contains("alpha") \
-        && !project.version.contains("beta") \
+    enabled = !rootVersion.contains("SNAPSHOT")
+        && !rootVersion.contains("alpha") \
+        && !rootVersion.contains("beta") \
         || project.rootProject.properties['docker.testRegistry'] \
             && project.rootProject.properties['docker.registry'] \
             == project.rootProject.properties['docker.testRegistry']