release management

build.gradle

@@ -261,11 +261,11 @@ task notifyJenkins() {
     }
 }
 
+
 ext {
     UpdateSiteReleaseBase = "efxclipse/driftfx/releases"
     UpdateSiteNightlyBase = "efxclipse/driftfx/nightly"
-
-    UpdateSitePath = Versioning.releaseMode ? "efxclipse/driftfx/$Versioning.version" : "efxclipse/driftfx/nightly/$Versioning.qualifier"
+    UpdateSitePath = Versioning.releaseMode ? "$UpdateSiteReleaseBase/$Versioning.version" : "$UpdateSiteNightlyBase/$Versioning.qualifier"
 }
 
 task deployUpdateSite() {
@@ -382,7 +382,7 @@ task publishGithubRelease() {
             Artifact Id: `org.eclipse.fx.drift`   
             Version: `$Versioning.version`   
 
-            """.stripIndent().trim(), false)
+            """.stripIndent().trim(), Versioning.isPreRelease)
 
             def releaseId = release.id
             println "Created Release $releaseId"
@@ -399,7 +399,8 @@ task publishGithubRelease() {
             println new groovy.json.JsonBuilder(modify).toPrettyString()
 
         } else {
-
+// no github release for nightly builds
+/*
           def release = github.createRelease(Versioning.timestamp, Versioning.gitSHA, "DriftFX Nightly $Versioning.qualifier", """
             This is a nightly build. (The Version number 999.0.0 indicates nightly builds)
 
@@ -429,7 +430,7 @@ task publishGithubRelease() {
             def modify = github.modifyRelease(releaseId, Versioning.timestamp, false)
             println new groovy.json.JsonBuilder(modify).toPrettyString()
 
-
+*/
         }
 
     }

versioning.gradle

@@ -42,7 +42,7 @@ def getReleaseTag() {
         standardOutput = stdout
     }
     def tag = stdout.toString().trim()
-    if (tag.matches('v[0-9]+\\.[0-9]+\\.[0-9]+')) {
+    if (tag.matches('v[0-9]+\\.[0-9]+\\.[0-9]+(\\.[a-z0-9]+)?')) {
         return tag
     }
     return null
@@ -75,6 +75,8 @@ def toTimestamp(instant) {
 
 def tmpReleaseTag = getReleaseTag()
 def tmpReleaseMode = tmpReleaseTag != null
+def tmpIsRelease = tmpReleaseTag != null && tmpReleaseTag.matches('v[0-9]+\\.[0-9]+\\.[0-9]+')
+def tmpIsPreRelease = tmpReleaseTag != null && tmpReleaseTag.matches('v[0-9]+\\.[0-9]+\\.[0-9]+\\.[a-z0-9]+')
 def tmpVersion = getVersion()
 def tmpTimestamp = getTimestamp()
 def tmpQualifier = getQualifier()
@@ -85,6 +87,8 @@ ext {
     Versioning = [
         releaseTag: tmpReleaseTag,
         releaseMode: tmpReleaseMode,
+	isRelease: tmpIsRelease,
+	isPreRelease: tmpIsPreRelease,
         version: tmpVersion,
         timestamp: tmpTimestamp,
         qualifier: tmpQualifier,
@@ -99,6 +103,8 @@ task showVersioning {
     println "Versioning: " //${new groovy.json.JsonBuilder(Versioning).toPrettyString()}"
     println "\tgitSHA: $Versioning.gitSHA"
     println "\treleaseMode: $Versioning.releaseMode"
+    println "\tisRelease: $Versioning.isRelease"
+    println "\tisPreRelease: $Versioning.isPreRelease"
     println "\treleaseTag: $Versioning.releaseTag"
     println "\tversion: $Versioning.version"
     println "\ttimestamp: $Versioning.timestamp"