From 3c707c3cdd9c4eb5ba0ac454d5f1c48271e7c64d Mon Sep 17 00:00:00 2001 From: Abigail de Joode Date: Tue, 2 Aug 2022 21:53:28 +0200 Subject: [PATCH] Fix tag not matching when there is no v prefix --- .../Assets/Editor/UnityBuilderAction/Versioning/Git.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs index 41622d18..02cdb075 100644 --- a/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs +++ b/dist/default-build-script/Assets/Editor/UnityBuilderAction/Versioning/Git.cs @@ -40,7 +40,7 @@ namespace UnityBuilderAction.Versioning /// public static string GetTagVersion() { - string version = Run(@"tag --points-at HEAD | grep ?[0-9]*"); + string version = Run(@"tag --points-at HEAD | grep *[0-9]*"); version = version.Substring(1); @@ -62,7 +62,7 @@ namespace UnityBuilderAction.Versioning /// static bool HasAnyVersionTags() { - return "0" != Run(@"tag --list --merged HEAD | grep ?[0-9]* | wc -l"); + return "0" != Run(@"tag --list --merged HEAD | grep *[0-9]* | wc -l"); } /// @@ -92,7 +92,7 @@ namespace UnityBuilderAction.Versioning /// static string GetVersionString() { - return Run(@"describe --tags --long --match ""?[0-9]*"""); + return Run(@"describe --tags --long --match ""*[0-9]*"""); // Todo - implement split function based on this more complete query // return Run(@"describe --long --tags --dirty --always");