DescribeHeadWithTag should only read tags that use v as prefix

nebula-plugins · Dec 5, 2023 · 7d369f6 · 7d369f6
1 parent 2e001fe
commit 7d369f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/integTest/groovy/nebula/plugin/release/ReleasePluginIntegrationSpec.groovy b/src/integTest/groovy/nebula/plugin/release/ReleasePluginIntegrationSpec.groovy
@@ -745,7 +745,7 @@ class ReleasePluginIntegrationSpec extends GitVersioningIntegrationTestKitSpec {
         def result = runTasksAndFail('assemble', '-Prelease.useLastTag=true')
 
         then:
-        result.output.contains "Current commit has a snapshot, immutableSnapshot or devSnapshot tag. 'useLastTag' requires a prerelease or final tag."
+        result.output.contains("Current commit has a snapshot, immutableSnapshot or devSnapshot tag. 'useLastTag' requires a prerelease or final tag.") || result.output.contains("but they were not recognized as valid versions")
         !new File(projectDir, "build/libs/${moduleName}-${dev('0.1.0-dev.3+').toString()}.jar").exists()
     }
 
@@ -757,7 +757,7 @@ class ReleasePluginIntegrationSpec extends GitVersioningIntegrationTestKitSpec {
         def result = runTasksAndFail('assemble', '-Prelease.useLastTag=true')
 
         then:
-        result.output.contains "Current commit has a snapshot, immutableSnapshot or devSnapshot tag. 'useLastTag' requires a prerelease or final tag."
+        result.output.contains("Current commit has a snapshot, immutableSnapshot or devSnapshot tag. 'useLastTag' requires a prerelease or final tag.") || result.output.contains("but they were not recognized as valid versions")
         !new File(projectDir, "build/libs/${moduleName}-${dev('0.1.0-snapshot.220190705103502+').toString()}.jar").exists()
     }
 
@@ -768,7 +768,7 @@ class ReleasePluginIntegrationSpec extends GitVersioningIntegrationTestKitSpec {
         def result = runTasksAndFail('assemble', '-Prelease.useLastTag=true')
 
         then:
-        result.output.contains "Current commit has a snapshot, immutableSnapshot or devSnapshot tag. 'useLastTag' requires a prerelease or final tag."
+        result.output.contains("Current commit has a snapshot, immutableSnapshot or devSnapshot tag. 'useLastTag' requires a prerelease or final tag.") || result.output.contains("but they were not recognized as valid versions")
         !new File(projectDir, "build/libs/${moduleName}-1.2.3-SNAPSHOT.jar").exists()
     }
 

diff --git a/src/main/groovy/nebula/plugin/release/git/command/GitReadCommand.groovy b/src/main/groovy/nebula/plugin/release/git/command/GitReadCommand.groovy
@@ -84,7 +84,7 @@ abstract class DescribeHeadWithTag extends GitReadCommand {
     @Override
     String obtain() {
         try {
-            return executeGitCommand( "describe", "HEAD", "--tags", "--long")
+            return executeGitCommand( "describe", "HEAD", "--tags", "--long", "--match", "v*")
         } catch (Exception e) {
             return null
         }
@@ -95,7 +95,7 @@ abstract class DescribeHeadWithTagWithExclude extends GitReadCommand {
     @Override
     String obtain() {
         try {
-            return executeGitCommandWithErrorIgnore( "describe", "HEAD", "--tags", "--long", "--exclude", "*-rc.*")
+            return executeGitCommandWithErrorIgnore( "describe", "HEAD", "--tags", "--long", "--match", "v*", "--exclude", "*-rc.*")
         } catch (Exception e) {
             return null
         }