diff --git a/photon-lib/publish.gradle b/photon-lib/publish.gradle index 7306ded65..766863e23 100644 --- a/photon-lib/publish.gradle +++ b/photon-lib/publish.gradle @@ -141,6 +141,7 @@ publishing { username 'ghactions' password System.getenv("ARTIFACTORY_API_KEY") } + println("Publishing to " + url) } } } diff --git a/versioningHelper.gradle b/versioningHelper.gradle index 1b8bde4e2..957220bee 100644 --- a/versioningHelper.gradle +++ b/versioningHelper.gradle @@ -15,8 +15,10 @@ gradle.allprojects { } catch(Exception e) { tagIsh = "dev-Unknown" } -// boolean isDev = tagIsh.matches(".*-[0-9]*-g[0-9a-f]*") -// if(isDev) tagIsh = "dev-" + tagIsh + // Dev tags: v2021.1.6-3-gf922466d + // We're specifically looking to capture the middle -3- + boolean isDev = tagIsh.matches(".*-[0-9]*-g[0-9a-f]*") + if(isDev && !tagIsh.startsWith("dev-")) tagIsh = "dev-" + tagIsh println("Picked up version: " + tagIsh) return tagIsh }