add additional logging and minor bug fix for branch construction in G…

…itHub
nefilim · Feb 23, 2022 · badac50 · badac50
1 parent 90de0d6
commit badac50
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml
@@ -32,6 +32,7 @@ jobs:
           arguments: |
             -Psemver.develop.stage=beta 
             clean build
+            --stacktrace
         env:
           GITHUB_TOKEN: ${{ github.token }}
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -76,6 +76,7 @@ jobs:
             clean build
             ${{ steps.stage_param.outputs.publishCommand }}
             githubRelease
+            --stacktrace
         env:
           GITHUB_TOKEN: ${{ github.token }}
           OSS_USER: '${{ secrets.OSS_USER }}'

diff --git a/src/main/kotlin/io/github/nefilim/gradle/semver/Git.kt b/src/main/kotlin/io/github/nefilim/gradle/semver/Git.kt
@@ -32,9 +32,9 @@ fun getGitContextProviderOperations(git: Git, config: VersionCalculatorConfig):
         private val tags = git.tagMap(config.tagPrefix)
 
         override fun currentBranch(): Option<GitRef.Branch> {
-            return git.currentBranchRef().flatMap {
-                it.shortName().map {
-                    GitRef.Branch(it)
+            return git.currentBranchRef().flatMap { ref ->
+                ref.shortName().map {
+                    GitRef.Branch(it, ref)
                 }.orNone()
             }
         }
@@ -181,6 +181,7 @@ internal fun Git.findYoungestTagOnBranchOlderThanTarget(
     target: RevCommit,
     tags: Tags
 ): Option<SemVer> {
+    logger.debug("pulling log for $branch refName")
     return log().add(repository.exactRef(branch.refName).objectId).call()
         .firstOrNull { it.commitTime <= target.commitTime && tags.containsKey(it.toObjectId()) }
         .toOption()

diff --git a/src/main/kotlin/io/github/nefilim/gradle/semver/SemVerExtension.kt b/src/main/kotlin/io/github/nefilim/gradle/semver/SemVerExtension.kt
@@ -64,6 +64,7 @@ abstract class SemVerExtension @Inject constructor(objects: ObjectFactory, priva
             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")