summaryrefslogtreecommitdiff
path: root/merge.go
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-02-19 14:42:59 -0600
committerJeff Carr <[email protected]>2024-02-19 14:42:59 -0600
commitad21d5d5db43b975e88067ff730691e89e10ea97 (patch)
tree6df12661892c57d20130cb85a8380ff63bda4ad6 /merge.go
parentbe73f6af0ea749ba87f301b85e60a4b95f1b8038 (diff)
experiment with widget 'mirror'
Diffstat (limited to 'merge.go')
-rw-r--r--merge.go42
1 files changed, 21 insertions, 21 deletions
diff --git a/merge.go b/merge.go
index e27858f..9f2a512 100644
--- a/merge.go
+++ b/merge.go
@@ -79,30 +79,30 @@ func (rs *RepoStatus) runFullAutomation() bool {
}
log.Warn("THINGS SEEM OK returned true. can run this again?")
/*
- log.Warn("develMerge =", rs.develMergeB.String())
- label := "merge devel into " + rs.GetMasterBranchName()
- if label == rs.develMergeB.String() {
- log.Warn("LABELS MATCH", label, rs.develMergeB.String())
- if !rs.RunDevelMergeB() {
- log.Warn("THINGS FAILED returned false")
- return false
+ log.Warn("develMerge =", rs.develMergeB.String())
+ label := "merge devel into " + rs.GetMasterBranchName()
+ if label == rs.develMergeB.String() {
+ log.Warn("LABELS MATCH", label, rs.develMergeB.String())
+ if !rs.RunDevelMergeB() {
+ log.Warn("THINGS FAILED returned false")
+ return false
+ }
}
- }
- if rs.develMergeB.String() == "ready to release" {
- log.Warn("THINGS SEEM OK ready to release")
- if rs.releaseVersion.String() == "Release!" {
- log.Warn("releaseVersion == 'Release!'. safe to do release version HERE?")
- log.Warn("rs.newversion =", rs.newversion.String())
- log.Warn("rs.targetReleaseVersion =", rs.targetReleaseVersion.String())
- log.Warn("Are these equal?")
- if rs.newversion.String() == rs.targetReleaseVersion.String() {
- log.Warn("THEY ARE EQUAL!")
- rs.runReleaseVersionB()
- } else {
- log.Warn("THEY ARE NOT EQUAL")
+ if rs.develMergeB.String() == "ready to release" {
+ log.Warn("THINGS SEEM OK ready to release")
+ if rs.releaseVersion.String() == "Release!" {
+ log.Warn("releaseVersion == 'Release!'. safe to do release version HERE?")
+ log.Warn("rs.newversion =", rs.newversion.String())
+ log.Warn("rs.targetReleaseVersion =", rs.targetReleaseVersion.String())
+ log.Warn("Are these equal?")
+ if rs.newversion.String() == rs.targetReleaseVersion.String() {
+ log.Warn("THEY ARE EQUAL!")
+ rs.runReleaseVersionB()
+ } else {
+ log.Warn("THEY ARE NOT EQUAL")
+ }
}
}
- }
*/
return true
}