allow overrideVersion to take effect even in detached head state if s…

…pecified
nefilim · Apr 7, 2022 · f005b92 · f005b92
1 parent 6882459
commit f005b92
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -191,7 +191,9 @@ afterEvaluate {
             }
         }
     }
-    signing.sign(publishing.publications)
+    val skipSigning = findProperty("skipSigning")?.let { (it as String).toBoolean() } ?: false
+    if (!skipSigning)
+        signing.sign(publishing.publications)
 }
 
 val githubTokenValue = findProperty("githubToken")?.toString() ?: System.getenv("GITHUB_TOKEN")

diff --git a/src/main/kotlin/io/github/nefilim/gradle/semver/Git.kt b/src/main/kotlin/io/github/nefilim/gradle/semver/Git.kt
@@ -146,7 +146,7 @@ internal fun commitsSinceBranchPoint(
                 logger.semverWarn("failed to find any semver tags on branch [$branch], does main have any version tags? using 0 as commit count since branch point")
                 0
             }, { youngestTag ->
-                logger.debug("youngest tag on this branch is at ${youngestTag.id.name} => ${tags[youngestTag.id]}")
+                logger.info("youngest tag on this branch is at ${youngestTag.id.name} => ${tags[youngestTag.id]}")
                 commits.takeWhile { it.id != youngestTag.id }.size
             }).right()
         }

diff --git a/src/main/kotlin/io/github/nefilim/gradle/semver/SemVerExtension.kt b/src/main/kotlin/io/github/nefilim/gradle/semver/SemVerExtension.kt
@@ -60,23 +60,22 @@ abstract class SemVerExtension @Inject constructor(objects: ObjectFactory, priva
         val ops = getGitContextProviderOperations(git, config)
         val context = GradleSemVerContext(project, ops)
 
-        return ops.currentBranch().fold({
-            logger.error("failed to find current branch, cannot calculate semver".red())
-            throw Exception("failed to find current branch")
-        }, { currentBranch ->
-            logger.semver("current branch: $currentBranch")
-            val calculator = getTargetBranchVersionCalculator(ops, config, context, currentBranch)
-            logger.info("semver configuration while calculating version: $config")
-
-            config.overrideVersion.getOrElse {
+        return config.overrideVersion.getOrElse {
+            ops.currentBranch().fold({
+                logger.error("failed to find current branch, cannot calculate semver".red())
+                throw Exception("failed to find current branch")
+            }, { currentBranch ->
+                logger.semver("current branch: $currentBranch")
+                val calculator = getTargetBranchVersionCalculator(ops, config, context, currentBranch)
+                logger.info("semver configuration while calculating version: $config")
                 calculator.calculateVersion().getOrHandle {
                     logger.error("failed to calculate version: $it".red())
                     throw Exception("$it")
                 }
-            }.also {
-                logger.semver(it.toString())
-            }
-        })
+            })
+        }.also {
+            logger.semver(it.toString())
+        }
     }
     private fun versionTagName(): String = tagPrefix.map { "$it${version}" }.get()
     private fun possiblyPrefixedVersion(version: String, prefix: String): SemVer {