jcarr
/
repostatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

almost to a release

This commit is contained in:
Jeff Carr 2024-02-16 21:28:22 -06:00
parent f82743d487
commit 6e7759f570
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
merge.go
View File

@ -10,18 +10,6 @@ import (
func (rs *RepoStatus) MergeUserToDevel() bool {
startbranch := rs.GetCurrentBranchName()
/*
devel := rs.GetDevelBranchName()
if ! rs.CheckoutBranch(devel) {
log.Warn("MergeUserToDevel() devel checkout failed", devel)
return false
}
newbranch := rs.GetCurrentBranchName()
if newbranch != devel {
log.Warn("MergeUserToDevel() devel checkout failed", devel)
return false
}
*/
devel := rs.GetDevelBranchName()
user := rs.GetUserBranchName()
@ -42,6 +30,29 @@ func (rs *RepoStatus) MergeUserToDevel() bool {
return false
}
func (rs *RepoStatus) MergeDevelToMaster() bool {
startbranch := rs.GetCurrentBranchName()
devel := rs.GetDevelBranchName()
main := rs.GetMasterBranchName()
log.Info("MergeDevelToMaster() checking out", main, "started on", startbranch, "merge", devel)
var all [][]string
all = append(all, []string{"git", "checkout", main})
all = append(all, []string{"git", "merge", devel})
all = append(all, []string{"git", "push"})
if rs.DoAll(all) {
log.Log(WARN, "MergeDevelToMaster() failed", rs.Path())
rs.UpdateNew()
return true
}
// DoAll failed
rs.UpdateNew()
return false
}
/*
func (rs *RepoStatus) runReleaseVersionB() bool {
if !rs.generateCmd() {
log.Warn("something is wrong. fix the errors first")
@ -59,6 +70,7 @@ func (rs *RepoStatus) runReleaseVersionB() bool {
rs.Hide()
return true
}
*/
func (rs *RepoStatus) runFullAutomation() bool {
if !rs.MergeUserToDevel() {
@ -76,7 +88,6 @@ func (rs *RepoStatus) runFullAutomation() bool {
return false
}
}
*/
if rs.develMergeB.String() == "ready to release" {
log.Warn("THINGS SEEM OK ready to release")
if rs.releaseVersion.String() == "Release!" {
@ -92,6 +103,7 @@ func (rs *RepoStatus) runFullAutomation() bool {
}
}
}
*/
return true
}

2
modifyBox.go
View File

@ -112,7 +112,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
rs.Disable()
rs.runReleaseVersionB()
rs.MergeDevelToMaster()
})
rs.releaseVersion.Hide()
newgrid.NextRow()