erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 00:17:11 -07:00
Code Releases Activity

Added AutoGitTagConfig.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-03-10 16:56:24 -08:00
parent 4f32f0ba2f
commit c80020c36a
2 changed files with 50 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/Git.kt
View file

@ -6,10 +6,10 @@ import com.google.inject.Inject
import java.io.File
class Git @Inject constructor() {
fun maybeTagRelease(project: Project, uploadResult: TaskResult, autoGitTag: Triple<Boolean, String, String>) : TaskResult {
fun maybeTagRelease(project: Project, uploadResult: TaskResult, auto: Boolean, tag: String, message: String) : TaskResult {
val result =
if (uploadResult.success && autoGitTag.first) {
val tagSuccess = tagRelease(project, autoGitTag)
if (uploadResult.success && auto) {
val tagSuccess = tagRelease(project, auto, tag, message)
if (! tagSuccess) {
TaskResult(false, "Couldn't tag the project")
} else {
@ -21,9 +21,9 @@ class Git @Inject constructor() {
return result
}
private fun tagRelease(project: Project, autoGitTag: Triple<Boolean, String, String>) : Boolean {
private fun tagRelease(project: Project, auto: Boolean, tag: String, message: String) : Boolean {
val version = if (tag.isNullOrBlank()) project.version else tag
val success = try {
val version = if (autoGitTag.second.isNullOrBlank()) project.version else autoGitTag.second
log(2, "Tagging this release as \"$version\"")
val repo = org.eclipse.jgit.storage.file.FileRepositoryBuilder()
.setGitDir(File(KFiles.joinDir(project.directory, ".git")))
@ -31,11 +31,11 @@ class Git @Inject constructor() {
.findGitDir()
.build()
val git = org.eclipse.jgit.api.Git(repo)
val ref = git.tag().setName(version).setMessage(autoGitTag.third).call()
val ref = git.tag().setName(version).setMessage(message).call()
git.push().setPushTags().call()
true
} catch(ex: Exception) {
warn("Couldn't create tag ${project.version}: ${ex.message}", ex)
warn("Couldn't create tag ${version}: ${ex.message}", ex)
false
}