From e0be6e57b18d581d4e57e600f9c06cb726d4a04e Mon Sep 17 00:00:00 2001 From: Jays2Kings Date: Mon, 20 Mar 2023 01:28:34 -0400 Subject: [PATCH] Update beta version number logic Previously it would just take the latest release and make the beta count based on the commits. Now if there is a previous beta version tag, its however many commits were made since the last beta tag --- buildSrc/src/main/kotlin/Commands.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Commands.kt b/buildSrc/src/main/kotlin/Commands.kt index ef20a4e64a..4e1a469a25 100644 --- a/buildSrc/src/main/kotlin/Commands.kt +++ b/buildSrc/src/main/kotlin/Commands.kt @@ -12,8 +12,14 @@ fun Project.getCommitCount(): String { } fun Project.getCommitCountSinceLastRelease(): String { - val lastTag = runCommand("git describe --tags --abbrev=0") - return runCommand("git rev-list --count $lastTag..HEAD").toIntOrNull()?.toString() ?: "1" + val betaTags = runCommand("git tag -l --sort=refname v${AndroidVersions.versionName}-b*") + return if (betaTags.isNotEmpty()) { + val betaTag = betaTags.split("\n").last() + runCommand("git rev-list --count $betaTag..HEAD").toIntOrNull()?.toString() ?: "1" + } else { + val lastTag = runCommand("git describe --tags --abbrev=0") + runCommand("git rev-list --count $lastTag..HEAD").toIntOrNull()?.toString() ?: "1" + } // return "1" }