Skip to content

Commit b7b5424

Browse files
authored
Update logic for determining project version (#540)
Hopefully to fix the release version to work correctly from the tag.
1 parent 3e2621f commit b7b5424

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,24 @@ tasks.named("check") {
1515
dependsOn test
1616
}
1717

18+
def isSnapshot = version.endsWith("-SNAPSHOT")
19+
def githubTokenProvider = providers.environmentVariable("GITHUB_TOKEN").orElse("")
20+
def githubShaProvider = providers.environmentVariable("GITHUB_SHA").orElse("")
21+
def repository = "mockito/mockito"
22+
1823
tasks.named("generateChangelog") {
19-
previousRevision = project.ext.'shipkit-auto-version.previous-version'
20-
githubToken = System.getenv("GITHUB_TOKEN")
21-
repository = "mockito/mockito-kotlin"
22-
releaseTag = project.version
24+
previousRevision = project.ext.'shipkit-auto-version.previous-tag'
25+
githubToken = githubTokenProvider.get()
26+
repository = repository
2327
}
2428

2529
tasks.named("githubRelease") {
2630
def genTask = tasks.named("generateChangelog").get()
2731
dependsOn genTask
28-
repository = genTask.repository
32+
repository = repository
2933
changelog = genTask.outputFile
30-
githubToken = System.getenv("GITHUB_TOKEN")
31-
newTagRevision = System.getenv("GITHUB_SHA")
32-
releaseTag = project.version
33-
releaseName = project.version
34+
githubToken = githubTokenProvider.get()
35+
newTagRevision = githubShaProvider.get()
3436
}
3537

3638
// Will be used to handle Sonatype staging repositories.
@@ -50,8 +52,6 @@ nexusPublishing {
5052
}
5153
}
5254

53-
def isSnapshot = version.endsWith("-SNAPSHOT")
54-
5555
if (isSnapshot) {
5656
println "Building a -SNAPSHOT version (Github release and Maven Central tasks are skipped)"
5757
tasks.named("githubRelease") {

0 commit comments

Comments
 (0)