From 4182fab4d541c299a3bcc3ac2143d4c95df7ef7c Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 17 Aug 2020 13:38:20 -0700 Subject: [PATCH] Fix versioning with no tags (#92) --- photon-server/versioningHelper.gradle | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/photon-server/versioningHelper.gradle b/photon-server/versioningHelper.gradle index 8ce7ae47e..84f5fff3b 100644 --- a/photon-server/versioningHelper.gradle +++ b/photon-server/versioningHelper.gradle @@ -5,11 +5,16 @@ import java.nio.file.Path gradle.allprojects { ext.getCurrentVersion = { -> def stdout = new ByteArrayOutputStream() - exec { - commandLine 'git', 'describe', '--tags' - standardOutput = stdout + String tagIsh + try { + exec { + commandLine 'git', 'describe', '--tags' + standardOutput = stdout + } + tagIsh = stdout.toString().trim().toLowerCase() + } catch(Exception e) { + tagIsh = "dev-Unknown" } - String tagIsh = stdout.toString().trim().toLowerCase() println("Picked up version: " + tagIsh) return tagIsh } @@ -18,7 +23,8 @@ gradle.allprojects { task writeCurrentVersionJava { String date = DateTimeFormatter.ofPattern("yyyy-M-d hh:mm:ss").format(LocalDateTime.now()) - File versionFile = new File(Path.of("$projectDir/src/main/java/org/photonvision/PhotonVersion.java").toAbsolutePath().toString()) + File versionFile = new File(Path.of("$projectDir", "src", "main", "java", "org", "photonvision", "PhotonVersion.java") + .toAbsolutePath().toString()) versionFile.delete() boolean success = versionFile.createNewFile() versionFile << "package org.photonvision;\n" +