func name change
This commit is contained in:
parent
ff91deee63
commit
c079039ffe
|
@ -58,7 +58,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
|
||||||
label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String()
|
label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String()
|
||||||
rs.mainMergeB = newgrid.NewButton(label, func() {
|
rs.mainMergeB = newgrid.NewButton(label, func() {
|
||||||
rs.Disable()
|
rs.Disable()
|
||||||
if result, err := rs.pb.MergeDevelToMaster(); err == nil {
|
if result, err := rs.pb.MergeToMaster(); err == nil {
|
||||||
log.Warn("THINGS SEEM OK fullAutomation() returned true.")
|
log.Warn("THINGS SEEM OK fullAutomation() returned true.")
|
||||||
} else {
|
} else {
|
||||||
log.Warn("THINGS FAILED fullAutomation() returned false", result.Error)
|
log.Warn("THINGS FAILED fullAutomation() returned false", result.Error)
|
||||||
|
@ -113,7 +113,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
|
||||||
|
|
||||||
rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
|
rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
|
||||||
rs.Disable()
|
rs.Disable()
|
||||||
rs.pb.MergeDevelToMaster()
|
rs.pb.MergeToMaster()
|
||||||
})
|
})
|
||||||
// rs.releaseVersion.Hide()
|
// rs.releaseVersion.Hide()
|
||||||
newgrid.NextRow()
|
newgrid.NextRow()
|
||||||
|
|
Loading…
Reference in New Issue