Merge pull request #2 from chrisjenx/cj/fixes

Cj/fixes
chrisjenx · Jul 26, 2024 · 38c2ba7 · 38c2ba7
2 parents aa0f44c + a7d7c2c
commit 38c2ba7
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -14,6 +14,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Get tags
+        run: git fetch --tags origin
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
@@ -38,6 +40,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Get tags
+        run: git fetch --tags origin
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
@@ -60,6 +64,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: Get tags
+        run: git fetch --tags origin
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:

diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -159,18 +159,29 @@ publishing {
 }
 
 @Suppress("UnstableApiUsage")
-val gitCurrentTag = providers.exec { commandLine("git", "describe", "--abbrev=0", "--tags") }
-    .standardOutput.asText.map { it.trim() }
+private val gitRevListTags = providers.exec {
+    commandLine("git", "rev-list", "--tags", "--max-count=1")
+}.standardOutput.asText.map { it.trim() }
+
+@Suppress("UnstableApiUsage")
+private val gitCurrentTag = providers.exec {
+    commandLine("git", "describe", "--tags", gitRevListTags.get())
+}.standardOutput.asText.map { it.trim() }
 
 // get git shortSha for version
 @Suppress("UnstableApiUsage")
-val gitSha = providers.exec { commandLine("git", "rev-parse", "--short", "HEAD") }
+private val gitSha = providers.exec { commandLine("git", "rev-parse", "--short", "HEAD") }
     .standardOutput.asText.map { it.trim() }
 
 mavenPublishing {
     // If gradle property release true remove sha from version
-    version = if (project.hasProperty("release")) gitCurrentTag.get()
-    else "${gitCurrentTag.get()}-${gitSha.get()}"
+    version = if (
+        providers.systemProperty("release").isPresent || providers.gradleProperty("release").isPresent
+    ) {
+        gitCurrentTag.get()
+    } else {
+        "${gitCurrentTag.get()}-${gitSha.get()}"
+    }
     coordinates("com.chrisjenx.yakcov", "library", version = version.toString())
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
     signAllPublications()