Fail if tag is older than base version #105

typelevel · Feb 4, 2022 · b3b9fc2 · b3b9fc2
1 parent c25dd34
commit b3b9fc2
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/versioning/src/main/scala/org/typelevel/sbt/TypelevelVersioningPlugin.scala b/versioning/src/main/scala/org/typelevel/sbt/TypelevelVersioningPlugin.scala
@@ -90,17 +90,18 @@ object TypelevelVersioningPlugin extends AutoPlugin {
             sys.error(s"version must be semver format: $version")
           case Some(value) =>
             if (!(value.isSameSeries(baseV) || value >= baseV))
-              sys.error(s"Your current version $version cannot be less than tlBaseVersion $baseV")
-            else
-              // Looks for the distance to latest release in this series
-              latestInSeries.foreach { latestInSeries =>
-                Try(s"git describe --tags --match v$latestInSeries".!!.trim)
-                  .collect { case Description(distance) => distance }
-                  .foreach { distance => version += s"-$distance" }
-              }
-            git.gitHeadCommit.value.foreach { sha => version += s"-${sha.take(7)}" }
-            version
+              sys.error(
+                s"Your current version $version cannot be less than tlBaseVersion $baseV")
+        }
+        // Looks for the distance to latest release in this series
+        latestInSeries.foreach { latestInSeries =>
+          Try(s"git describe --tags --match v$latestInSeries".!!.trim)
+            .collect { case Description(distance) => distance }
+            .foreach { distance => version += s"-$distance" }
         }
+        git.gitHeadCommit.value.foreach { sha => version += s"-${sha.take(7)}" }
+        version
+
       }
 
       // Even if version was provided by a tag, we check for uncommited changes