parent
998afefb3c
commit
54d8059a74
60
draw.go
60
draw.go
|
@ -57,6 +57,7 @@ func draw(rs *RepoStatus) {
|
|||
rs.getLastTagVersion()
|
||||
if rs.lasttag.Get() != rs.masterBranch.Get() {
|
||||
log.Warn("master does not equal last tag")
|
||||
rs.incrementVersion()
|
||||
rs.releaseVersion.Enable()
|
||||
return
|
||||
}
|
||||
|
@ -76,20 +77,12 @@ func draw(rs *RepoStatus) {
|
|||
})
|
||||
rs.develMerge.Disable()
|
||||
|
||||
rs.releaseVersion = rs.grid.NewButton("release version", func() {
|
||||
lasttag := rs.lasttag.Get()
|
||||
var major, minor, revision string
|
||||
major, minor, revision = splitVersion(lasttag)
|
||||
log.Warn("Should release version here", lasttag)
|
||||
log.Warn("Should release a,b,c", major, minor, revision)
|
||||
|
||||
// rs.a = major
|
||||
// rs.b = minor
|
||||
// rs.c = revision
|
||||
rs.a, _ = strconv.Atoi(major)
|
||||
rs.b, _ = strconv.Atoi(minor)
|
||||
rs.c, _ = strconv.Atoi(revision)
|
||||
rs.setCombobox()
|
||||
rs.releaseVersion = rs.grid.NewButton("tag and release version", func() {
|
||||
a := rs.major.Get()
|
||||
b := rs.minor.Get()
|
||||
c := rs.revision.Get()
|
||||
newver := a + "." + b + "." + c
|
||||
log.Warn("Should tag version:", newver)
|
||||
})
|
||||
rs.releaseVersion.Disable()
|
||||
|
||||
|
@ -102,26 +95,27 @@ func draw(rs *RepoStatus) {
|
|||
rs.grid.Pad()
|
||||
}
|
||||
|
||||
func (rs *RepoStatus) setCombobox() {
|
||||
addCombobox(rs.major, rs.a)
|
||||
addCombobox(rs.major, rs.a + 1)
|
||||
setCombobox(rs.major, rs.a)
|
||||
func (rs *RepoStatus) incrementVersion() {
|
||||
lasttag := rs.lasttag.Get()
|
||||
var major, minor, revision string
|
||||
major, minor, revision = splitVersion(lasttag)
|
||||
log.Warn("Should release version here", lasttag)
|
||||
log.Warn("Should release a,b,c", major, minor, revision)
|
||||
|
||||
addCombobox(rs.minor, rs.b)
|
||||
addCombobox(rs.minor, rs.b + 1)
|
||||
setCombobox(rs.minor, rs.b)
|
||||
rs.a, _ = strconv.Atoi(major)
|
||||
rs.b, _ = strconv.Atoi(minor)
|
||||
rs.c, _ = strconv.Atoi(revision)
|
||||
|
||||
rs.major.Add(rs.a)
|
||||
rs.major.Add(rs.a + 1)
|
||||
rs.major.Set(rs.a)
|
||||
|
||||
rs.minor.Add(rs.b)
|
||||
rs.minor.Add(rs.b + 1)
|
||||
rs.minor.Set(rs.b)
|
||||
|
||||
// rs.c := strconv.Atoi(revision)
|
||||
rs.revision.Add(strconv.Itoa(rs.c + 1))
|
||||
rs.revision.Add(strconv.Itoa(rs.c + 2))
|
||||
}
|
||||
|
||||
func addCombobox(cb *gadgets.BasicCombobox, i int) {
|
||||
// s := strconv.Itoa(i)
|
||||
cb.Add(i)
|
||||
}
|
||||
|
||||
func setCombobox(cb *gadgets.BasicCombobox, i int) {
|
||||
// s := strconv.Itoa(i)
|
||||
cb.Set(i)
|
||||
rs.revision.Add(rs.c + 1)
|
||||
rs.revision.Add(rs.c + 2)
|
||||
rs.revision.Set(rs.c + 1)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue