Compare commits
No commits in common. "master" and "v0.23.98" have entirely different histories.
35
Makefile
35
Makefile
|
@ -58,6 +58,9 @@ findNext:
|
||||||
showNext:
|
showNext:
|
||||||
curl --silent http://localhost:9419/showNext
|
curl --silent http://localhost:9419/showNext
|
||||||
|
|
||||||
|
testNext:
|
||||||
|
curl --silent http://localhost:9419/testNext
|
||||||
|
|
||||||
doRelease:
|
doRelease:
|
||||||
reset
|
reset
|
||||||
make showNext
|
make showNext
|
||||||
|
@ -86,40 +89,10 @@ list-release-notdone:
|
||||||
curl --silent http://localhost:9419/releaseList?readonly=true
|
curl --silent http://localhost:9419/releaseList?readonly=true
|
||||||
|
|
||||||
safe-build: install
|
safe-build: install
|
||||||
# forge list --private
|
forge list --private
|
||||||
wit-test install --verbose
|
wit-test install --verbose
|
||||||
# cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui gocui --gui-verbose --gui-file ../../toolkits/gocui/gocui.so >/tmp/forge.log 2>&1
|
# cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui gocui --gui-verbose --gui-file ../../toolkits/gocui/gocui.so >/tmp/forge.log 2>&1
|
||||||
rm -f go.* ; git checkout go.mod ; cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs
|
rm -f go.* ; git checkout go.mod ; cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs
|
||||||
|
|
||||||
build-quick: install
|
|
||||||
wit-test install --verbose
|
|
||||||
# rm -f go.* ; git checkout go.mod ;cd ~/go/src/go.wit.com/lib/xgb/ && time GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs quick
|
|
||||||
sudo "wit update"
|
|
||||||
|
|
||||||
autocomplete:
|
autocomplete:
|
||||||
guireleaser --bash > ~/.local/share/bash-completion/completions/guireleaser
|
guireleaser --bash > ~/.local/share/bash-completion/completions/guireleaser
|
||||||
|
|
||||||
test-build-force:
|
|
||||||
GUIRELEASE_REASON="safe-build" guireleaser --gui andlabs --force
|
|
||||||
|
|
||||||
# time GUIRELEASE_REASON="safe-build" make test-build
|
|
||||||
test-build:
|
|
||||||
wit-test install --verbose
|
|
||||||
rm ~/go/bin/forged
|
|
||||||
cd ~/go/src/go.wit.com/lib/xgb/ && rm -f go.*
|
|
||||||
cd ~/go/src/go.wit.com/lib/xgb/ && git checkout go.mod
|
|
||||||
cd ~/go/src/go.wit.com/lib/xgb/ && time guireleaser --gui andlabs
|
|
||||||
cd ~/go/src/go.wit.com/apps/guireleaser
|
|
||||||
wit-test debian --verbose
|
|
||||||
do-aptly
|
|
||||||
|
|
||||||
# time GUIRELEASE_REASON="safe-build" make test-build-quick
|
|
||||||
test-build-quick:
|
|
||||||
wit-test install --verbose
|
|
||||||
rm ~/go/bin/forged
|
|
||||||
cd ~/go/src/go.wit.com/lib/xgb/ && rm -f go.*
|
|
||||||
cd ~/go/src/go.wit.com/lib/xgb/ && git checkout go.mod
|
|
||||||
cd ~/go/src/go.wit.com/lib/xgb/ && time guireleaser --gui andlabs quick
|
|
||||||
cd ~/go/src/go.wit.com/apps/guireleaser
|
|
||||||
wit-test debian --verbose
|
|
||||||
do-aptly
|
|
||||||
|
|
42
argv.go
42
argv.go
|
@ -1,11 +1,5 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"os/user"
|
|
||||||
)
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
this parses the command line arguements
|
this parses the command line arguements
|
||||||
|
|
||||||
|
@ -47,39 +41,3 @@ the repositories in the go.sum file using git clone`
|
||||||
func (args) Version() string {
|
func (args) Version() string {
|
||||||
return "guireleaser " + VERSION
|
return "guireleaser " + VERSION
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
handles shell autocomplete
|
|
||||||
*/
|
|
||||||
|
|
||||||
func (a args) DoAutoComplete(argv []string) {
|
|
||||||
switch argv[0] {
|
|
||||||
case "checkout":
|
|
||||||
usr, _ := user.Current()
|
|
||||||
fmt.Println("user devel master " + usr.Username)
|
|
||||||
case "commit":
|
|
||||||
fmt.Println("--all")
|
|
||||||
case "config":
|
|
||||||
fmt.Println("add fix list delete")
|
|
||||||
case "list":
|
|
||||||
fmt.Println("--all --mine --favorites --private")
|
|
||||||
case "pull":
|
|
||||||
fmt.Println("--all --mine --favorites --private")
|
|
||||||
case "patch":
|
|
||||||
fmt.Println("--list --submit --show")
|
|
||||||
case "dirty":
|
|
||||||
fmt.Println("--show-files")
|
|
||||||
case "user":
|
|
||||||
fmt.Println("--force")
|
|
||||||
case "devel":
|
|
||||||
fmt.Println("--force")
|
|
||||||
case "master":
|
|
||||||
fmt.Println("--force")
|
|
||||||
default:
|
|
||||||
if argv[0] == ARGNAME {
|
|
||||||
// list the subcommands here
|
|
||||||
fmt.Println("--bash quick")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
os.Exit(0)
|
|
||||||
}
|
|
||||||
|
|
|
@ -0,0 +1,97 @@
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"os/user"
|
||||||
|
)
|
||||||
|
|
||||||
|
/*
|
||||||
|
handles shell autocomplete
|
||||||
|
*/
|
||||||
|
|
||||||
|
// used for shell auto completion
|
||||||
|
// var ARGNAME string = "forge" // todo: get this from $0 ?
|
||||||
|
|
||||||
|
func (args) doBashAuto() {
|
||||||
|
argv.doBashHelp()
|
||||||
|
switch argv.BashAuto[0] {
|
||||||
|
case "checkout":
|
||||||
|
usr, _ := user.Current()
|
||||||
|
fmt.Println("user devel master " + usr.Username)
|
||||||
|
case "commit":
|
||||||
|
fmt.Println("--all")
|
||||||
|
case "config":
|
||||||
|
fmt.Println("add fix list delete")
|
||||||
|
case "list":
|
||||||
|
fmt.Println("--all --mine --favorites --private")
|
||||||
|
case "pull":
|
||||||
|
fmt.Println("--all --mine --favorites --private")
|
||||||
|
case "patch":
|
||||||
|
fmt.Println("--list --submit --show")
|
||||||
|
case "dirty":
|
||||||
|
fmt.Println("--show-files")
|
||||||
|
case "user":
|
||||||
|
fmt.Println("--force")
|
||||||
|
case "devel":
|
||||||
|
fmt.Println("--force")
|
||||||
|
case "master":
|
||||||
|
fmt.Println("--force")
|
||||||
|
default:
|
||||||
|
if argv.BashAuto[0] == ARGNAME {
|
||||||
|
// list the subcommands here
|
||||||
|
fmt.Println("--bash quick")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
os.Exit(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// prints help to STDERR // TODO: move everything below this to go-args
|
||||||
|
func (args) doBashHelp() {
|
||||||
|
if argv.BashAuto[1] != "''" {
|
||||||
|
// if this is not blank, then the user has typed something
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if argv.BashAuto[0] != ARGNAME {
|
||||||
|
// if this is not the name of the command, the user already started doing something
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if argv.BashAuto[0] == ARGNAME {
|
||||||
|
me.pp.WriteHelp(os.Stderr)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
fmt.Fprintln(os.Stderr, "")
|
||||||
|
fmt.Fprintln(os.Stderr, "hello world")
|
||||||
|
fmt.Fprintln(os.Stderr, "")
|
||||||
|
}
|
||||||
|
|
||||||
|
// complete -F forge --bash forge
|
||||||
|
func (args) doBash() {
|
||||||
|
fmt.Println("# add this in your bashrc:")
|
||||||
|
fmt.Println("")
|
||||||
|
fmt.Println("# todo: add this to go-arg as a 'hidden' go-arg option --bash")
|
||||||
|
fmt.Println("#")
|
||||||
|
fmt.Println("# todo: make this output work/parse with:")
|
||||||
|
fmt.Println("# complete -C " + ARGNAME + " --bash go")
|
||||||
|
fmt.Println("")
|
||||||
|
fmt.Println("_" + ARGNAME + "_complete()")
|
||||||
|
fmt.Println("{")
|
||||||
|
fmt.Println(" # sets local to this func vars")
|
||||||
|
fmt.Println(" local cur prev all")
|
||||||
|
fmt.Println(" cur=${COMP_WORDS[COMP_CWORD]}")
|
||||||
|
fmt.Println(" prev=${COMP_WORDS[COMP_CWORD-1]}")
|
||||||
|
fmt.Println(" all=${COMP_WORDS[@]}")
|
||||||
|
fmt.Println("")
|
||||||
|
fmt.Println(" # this is where we generate the go-arg output")
|
||||||
|
fmt.Println(" GOARGS=$(" + ARGNAME + " --auto-complete $prev \\'$cur\\' $all)")
|
||||||
|
fmt.Println("")
|
||||||
|
fmt.Println(" # this compares the command line input from the user")
|
||||||
|
fmt.Println(" # to whatever strings we output")
|
||||||
|
fmt.Println(" COMPREPLY=( $(compgen -W \"$GOARGS\" -- $cur) ) # THIS WORKS")
|
||||||
|
fmt.Println(" return 0")
|
||||||
|
fmt.Println("}")
|
||||||
|
fmt.Println("complete -F _" + ARGNAME + "_complete " + ARGNAME)
|
||||||
|
fmt.Println("")
|
||||||
|
fmt.Println("# copy and paste the above into your bash shell should work")
|
||||||
|
os.Exit(0)
|
||||||
|
}
|
32
doRelease.go
32
doRelease.go
|
@ -54,19 +54,9 @@ func doRelease() error {
|
||||||
log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
|
log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
|
||||||
log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
|
log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
|
||||||
log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
|
log.Info("doRelease() WARNING. should have never gotten here. return true. already done", check.GetGoPath())
|
||||||
check.ReloadCheck()
|
check.Reload()
|
||||||
return fmt.Errorf("already released %s", check.GetGoPath())
|
return fmt.Errorf("already released %s", check.GetGoPath())
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if the git tag already exists somehow
|
|
||||||
testtag := me.release.version.String()
|
|
||||||
if check.LocalTagExists(testtag) {
|
|
||||||
log.Info("TAG ALREADY EXISTS", testtag)
|
|
||||||
return log.Errorf("%s TAG ALREADY EXISTS %s", check.FullPath, testtag)
|
|
||||||
} else {
|
|
||||||
log.Info("TAG IS NEW", testtag)
|
|
||||||
}
|
|
||||||
|
|
||||||
if me.forge.Config.IsPrivate(me.current.GetGoPath()) {
|
if me.forge.Config.IsPrivate(me.current.GetGoPath()) {
|
||||||
// do not self update private repos
|
// do not self update private repos
|
||||||
log.Info("This is a private repo.")
|
log.Info("This is a private repo.")
|
||||||
|
@ -210,6 +200,26 @@ func doRelease() error {
|
||||||
}
|
}
|
||||||
log.Info("EVERYTHING OK. RERELEASED", me.current.GetGoPath())
|
log.Info("EVERYTHING OK. RERELEASED", me.current.GetGoPath())
|
||||||
|
|
||||||
|
return skipToNext()
|
||||||
|
}
|
||||||
|
|
||||||
|
func skipToNext() error {
|
||||||
|
me.current.Reload()
|
||||||
|
me.forge.SetConfigSave(true)
|
||||||
|
me.forge.ConfigSave()
|
||||||
|
log.Info("sleep 2")
|
||||||
|
time.Sleep(2 * time.Second)
|
||||||
|
printDone()
|
||||||
|
|
||||||
|
rePrepareRelease()
|
||||||
|
findNext()
|
||||||
|
if me.current == nil {
|
||||||
|
log.Info("NOT GOOD TO RUN ANOTHER DAY")
|
||||||
|
log.Info("took out all the loop code")
|
||||||
|
setCurrentRepo(nil, "loop by hand motherfucker", "fucknuts")
|
||||||
|
return fmt.Errorf("findNext returned next repo == nil")
|
||||||
|
}
|
||||||
|
log.Info("GOOD TO RUN ANOTHER DAY ON:", me.current.GetGoPath())
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
5
exit.go
5
exit.go
|
@ -8,12 +8,11 @@ import (
|
||||||
|
|
||||||
func okExit(thing string) {
|
func okExit(thing string) {
|
||||||
log.Info(thing, "ok")
|
log.Info(thing, "ok")
|
||||||
// log.Info("Finished go-clean on", check.GetNamespace(), "ok")
|
// log.Info("Finished go-clean on", check.GetGoPath(), "ok")
|
||||||
me.forge.Exit()
|
|
||||||
os.Exit(0)
|
os.Exit(0)
|
||||||
}
|
}
|
||||||
|
|
||||||
func badExit(err error) {
|
func badExit(err error) {
|
||||||
log.Info("forge failed: ", err, me.forge.Config.ReposDir)
|
log.Info("forge failed: ", err, me.forge.GetGoSrc())
|
||||||
os.Exit(-1)
|
os.Exit(-1)
|
||||||
}
|
}
|
||||||
|
|
52
findNext.go
52
findNext.go
|
@ -1,3 +1,4 @@
|
||||||
|
// This is a simple example
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
@ -8,6 +9,7 @@ import (
|
||||||
|
|
||||||
"go.wit.com/log"
|
"go.wit.com/log"
|
||||||
|
|
||||||
|
"go.wit.com/lib/gui/shell"
|
||||||
"go.wit.com/lib/protobuf/gitpb"
|
"go.wit.com/lib/protobuf/gitpb"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -17,15 +19,15 @@ var findOk bool = true
|
||||||
|
|
||||||
func checkDeps(repo *gitpb.Repo) error {
|
func checkDeps(repo *gitpb.Repo) error {
|
||||||
if repo.GoDeps == nil {
|
if repo.GoDeps == nil {
|
||||||
return fmt.Errorf("%s has GoDeps == nil", repo.GetNamespace())
|
return fmt.Errorf("%s has GoDeps == nil", repo.GetGoPath())
|
||||||
}
|
}
|
||||||
for dep := range repo.GoDeps.IterAll() {
|
for dep := range repo.GoDeps.IterAll() {
|
||||||
// log.Info(repo.GetNamespace(), dep.GoPath, dep.Version)
|
// log.Info(repo.GetGoPath(), dep.GoPath, dep.Version)
|
||||||
|
|
||||||
// check if the package in question is waiting for another package to publish
|
// check if the package in question is waiting for another package to publish
|
||||||
found := me.forge.FindByGoPath(dep.GoPath)
|
found := me.forge.FindByGoPath(dep.GoPath)
|
||||||
if found == nil {
|
if found == nil {
|
||||||
return fmt.Errorf("%s has dep == nil", repo.GetNamespace(), dep.GoPath)
|
return fmt.Errorf("%s has dep == nil", repo.GetGoPath(), dep.GoPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
// loop through all the repos that need to be published with new go versions
|
// loop through all the repos that need to be published with new go versions
|
||||||
|
@ -33,9 +35,9 @@ func checkDeps(repo *gitpb.Repo) error {
|
||||||
for all.Scan() {
|
for all.Scan() {
|
||||||
check := all.Next()
|
check := all.Next()
|
||||||
|
|
||||||
if found.GetNamespace() == check.GetNamespace() {
|
if found.GetGoPath() == check.GetGoPath() {
|
||||||
// this package is waiting on other packages to publish
|
// this package is waiting on other packages to publish
|
||||||
return fmt.Errorf("%s is waiting on %s", repo.GetNamespace(), found.GetNamespace())
|
return fmt.Errorf("%s is waiting on %s", repo.GetGoPath(), found.GetGoPath())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// found package isn't being published. is the version correct?
|
// found package isn't being published. is the version correct?
|
||||||
|
@ -44,7 +46,7 @@ func checkDeps(repo *gitpb.Repo) error {
|
||||||
if found.GetLastTag() == dep.Version {
|
if found.GetLastTag() == dep.Version {
|
||||||
// everything is normal
|
// everything is normal
|
||||||
} else {
|
} else {
|
||||||
return fmt.Errorf("%s version mismatch on %s (%s vs %s)", repo.GetNamespace(), found.GetNamespace(), found.GetLastTag(), dep.Version)
|
return fmt.Errorf("%s version mismatch on %s (%s vs %s)", repo.GetGoPath(), found.GetGoPath(), found.GetLastTag(), dep.Version)
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
@ -61,21 +63,21 @@ func findNext() bool {
|
||||||
for all.Scan() {
|
for all.Scan() {
|
||||||
check := all.Next()
|
check := all.Next()
|
||||||
if check.GetMasterBranchName() != check.GetCurrentBranchName() {
|
if check.GetMasterBranchName() != check.GetCurrentBranchName() {
|
||||||
log.Info("YOU MUST BE ON THE MASTER BRANCH", check.GetNamespace())
|
log.Info("YOU MUST BE ON THE MASTER BRANCH", check.GetGoPath())
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if check.IsDirty() {
|
if check.IsDirty() {
|
||||||
log.Info("CAN NOT RELEASE DIRTY REPO", check.GetNamespace())
|
log.Info("CAN NOT RELEASE DIRTY REPO", check.GetGoPath())
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if alreadyDone(check) {
|
if alreadyDone(check) {
|
||||||
log.Info("findNext() alreadyDone. WHY IS THIS STILL CHECKING?", check.GetNamespace())
|
log.Info("findNext() alreadyDone. WHY IS THIS STILL CHECKING?", check.GetGoPath())
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
log.Info("CHECKING START:", check.GetNamespace())
|
log.Info("CHECKING START:", check.GetGoPath())
|
||||||
|
|
||||||
if me.forge.Config.IsPrivate(check.GetNamespace()) {
|
if me.forge.Config.IsPrivate(check.GetGoPath()) {
|
||||||
log.Info("GOOD TO GO ON PRIVATE REPO", check.GetNamespace())
|
log.Info("GOOD TO GO ON PRIVATE REPO", check.GetGoPath())
|
||||||
setCurrentRepo(check, "should be good to release", "pretty sure")
|
setCurrentRepo(check, "should be good to release", "pretty sure")
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
@ -105,20 +107,31 @@ func findNext() bool {
|
||||||
|
|
||||||
if err := me.forge.FinalGoDepsCheckOk(check, argv.Verbose); err != nil {
|
if err := me.forge.FinalGoDepsCheckOk(check, argv.Verbose); err != nil {
|
||||||
// if err := me.forge.FinalGoDepsCheckOk(check, false); err != nil {
|
// if err := me.forge.FinalGoDepsCheckOk(check, false); err != nil {
|
||||||
log.Info("FinalGoDepsCheckOk() repo=", check.GetNamespace(), "err:", err)
|
log.Info("FinalGoDepsCheckOk() repo=", check.GetGoPath(), "err:", err)
|
||||||
log.Info("CHECKING END:", check.GetNamespace())
|
log.Info("CHECKING END:", check.GetGoPath())
|
||||||
log.Info("")
|
log.Info("")
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
log.Info("GOOD TO GO ON", check.GetNamespace())
|
log.Info("GOOD TO GO ON", check.GetGoPath())
|
||||||
setCurrentRepo(check, "should be good to release", "pretty sure")
|
setCurrentRepo(check, "should be good to release", "pretty sure")
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
if findCounter == 0 {
|
if findCounter == 0 {
|
||||||
log.Info("NOTHING TO UPDATE. findCounter =", findCounter, "found len =", me.found.Len())
|
log.Info("NOTHING TO UPDATE. findCounter =", findCounter, "found len =", me.found.Len())
|
||||||
if me.found.Len() == 0 {
|
if me.found.Len() == 0 {
|
||||||
printDone()
|
printDone()
|
||||||
|
log.Info("cd lib/; make debian")
|
||||||
|
wit := me.forge.FindByGoPath("go.wit.com/apps/utils/wit-test")
|
||||||
|
if wit != nil {
|
||||||
|
log.Info("cd", wit.GetFullPath())
|
||||||
|
os.Chdir(wit.GetFullPath())
|
||||||
|
shell.Exec([]string{"ls", "-l"})
|
||||||
|
if argv.Full {
|
||||||
|
shell.Exec([]string{"make", "debian-release-force"})
|
||||||
|
} else {
|
||||||
|
shell.Exec([]string{"make", "debian-release"})
|
||||||
|
}
|
||||||
|
}
|
||||||
okExit("")
|
okExit("")
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -138,7 +151,7 @@ func setCurrentRepo(check *gitpb.Repo, s string, note string) bool {
|
||||||
me.release.releaseVersionB.SetText("nope")
|
me.release.releaseVersionB.SetText("nope")
|
||||||
me.release.version.SetText("badver")
|
me.release.version.SetText("badver")
|
||||||
} else {
|
} else {
|
||||||
me.release.repo.SetText(check.GetNamespace())
|
me.release.repo.SetText(check.GetGoPath())
|
||||||
me.release.version.SetText(check.GetTargetVersion())
|
me.release.version.SetText(check.GetTargetVersion())
|
||||||
me.release.releaseVersionB.SetText("release version " + check.GetTargetVersion())
|
me.release.releaseVersionB.SetText("release version " + check.GetTargetVersion())
|
||||||
me.release.version.SetText(check.GetTargetVersion())
|
me.release.version.SetText(check.GetTargetVersion())
|
||||||
|
@ -146,6 +159,7 @@ func setCurrentRepo(check *gitpb.Repo, s string, note string) bool {
|
||||||
me.release.status.SetText(s)
|
me.release.status.SetText(s)
|
||||||
me.release.notes.SetText(note)
|
me.release.notes.SetText(note)
|
||||||
// me.release.openrepo.Enable()
|
// me.release.openrepo.Enable()
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -156,12 +170,12 @@ func testGoDepsCheckOk(godeps *gitpb.GoDeps, verbose bool) error {
|
||||||
all := godeps.SortByGoPath()
|
all := godeps.SortByGoPath()
|
||||||
for all.Scan() {
|
for all.Scan() {
|
||||||
depRepo := all.Next()
|
depRepo := all.Next()
|
||||||
fullpath := filepath.Join(me.forge.Config.ReposDir, depRepo.GoPath)
|
fullpath := filepath.Join(me.forge.GetGoSrc(), depRepo.GetGoPath())
|
||||||
found := me.found.FindByFullPath(fullpath)
|
found := me.found.FindByFullPath(fullpath)
|
||||||
if found == nil {
|
if found == nil {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
return fmt.Errorf("dep is being upgraded %s", depRepo.GoPath)
|
return fmt.Errorf("dep is being upgraded %s", depRepo.GetGoPath())
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
28
main.go
28
main.go
|
@ -8,9 +8,9 @@ import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"go.wit.com/dev/alexflint/arg"
|
"go.wit.com/dev/alexflint/arg"
|
||||||
|
"go.wit.com/gui"
|
||||||
"go.wit.com/lib/fhelp"
|
"go.wit.com/lib/fhelp"
|
||||||
"go.wit.com/lib/gadgets"
|
"go.wit.com/lib/gadgets"
|
||||||
"go.wit.com/lib/gui/prep"
|
|
||||||
"go.wit.com/lib/gui/shell"
|
"go.wit.com/lib/gui/shell"
|
||||||
"go.wit.com/lib/protobuf/forgepb"
|
"go.wit.com/lib/protobuf/forgepb"
|
||||||
"go.wit.com/lib/protobuf/gitpb"
|
"go.wit.com/lib/protobuf/gitpb"
|
||||||
|
@ -27,18 +27,28 @@ var argv args
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
me = new(autoType)
|
me = new(autoType)
|
||||||
prep.Bash(ARGNAME, argv.DoAutoComplete) // this line should be: prep.Bash(argv)
|
|
||||||
me.myGui = prep.Gui() // prepares the GUI package for go-args
|
// parse the command line
|
||||||
|
gui.InitArg()
|
||||||
me.pp = arg.MustParse(&argv)
|
me.pp = arg.MustParse(&argv)
|
||||||
|
|
||||||
|
if argv.Bash {
|
||||||
|
argv.doBash()
|
||||||
|
os.Exit(0)
|
||||||
|
}
|
||||||
|
if len(argv.BashAuto) != 0 {
|
||||||
|
argv.doBashAuto()
|
||||||
|
os.Exit(0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// load the ~/.config/forge/ config
|
||||||
me.forge = forgepb.Init()
|
me.forge = forgepb.Init()
|
||||||
me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
|
|
||||||
me.found = new(gitpb.Repos)
|
me.found = new(gitpb.Repos)
|
||||||
|
|
||||||
fhelp.CheckGoModCleanExit()
|
fhelp.CheckGoModCleanExit()
|
||||||
|
|
||||||
// me.forge.ConfigPrintTable()
|
// me.forge.ConfigPrintTable()
|
||||||
os.Setenv("REPO_WORK_PATH", me.forge.Config.ReposDir)
|
os.Setenv("REPO_WORK_PATH", me.forge.GetGoSrc())
|
||||||
|
|
||||||
// save the ENV var here
|
// save the ENV var here
|
||||||
me.releaseReasonS = os.Getenv("GUIRELEASE_REASON")
|
me.releaseReasonS = os.Getenv("GUIRELEASE_REASON")
|
||||||
|
@ -52,7 +62,9 @@ func main() {
|
||||||
// user drops to a shell or xterm, then they shouldn't be set there either
|
// user drops to a shell or xterm, then they shouldn't be set there either
|
||||||
os.Unsetenv("GO111MODULE")
|
os.Unsetenv("GO111MODULE")
|
||||||
|
|
||||||
me.myGui.Start() // loads the GUI toolkit
|
me.myGui = gui.New()
|
||||||
|
me.myGui.InitEmbed(resources)
|
||||||
|
me.myGui.Default()
|
||||||
|
|
||||||
// our main window
|
// our main window
|
||||||
me.mainWindow = gadgets.RawBasicWindow("GUI release manager " + VERSION)
|
me.mainWindow = gadgets.RawBasicWindow("GUI release manager " + VERSION)
|
||||||
|
@ -94,10 +106,6 @@ func main() {
|
||||||
|
|
||||||
if _, count, _, err := me.forge.IsEverythingOnMaster(); err != nil {
|
if _, count, _, err := me.forge.IsEverythingOnMaster(); err != nil {
|
||||||
log.Info("not everything is on the master branch (", count, "repos)")
|
log.Info("not everything is on the master branch (", count, "repos)")
|
||||||
if argv.Quick != nil {
|
|
||||||
// quick also means ignore the master branch check
|
|
||||||
argv.Force = true
|
|
||||||
}
|
|
||||||
if !argv.Force {
|
if !argv.Force {
|
||||||
os.Exit(-1)
|
os.Exit(-1)
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,7 +90,8 @@ func rillRestore(repo *gitpb.Repo) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
func rePrepareRelease() {
|
func rePrepareRelease() {
|
||||||
me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
|
// reload the config
|
||||||
|
// me.forge = forgepb.Init()
|
||||||
me.found = new(gitpb.Repos)
|
me.found = new(gitpb.Repos)
|
||||||
me.reason = make(map[*gitpb.Repo]string) // stores the reason repos need to be versioned & released
|
me.reason = make(map[*gitpb.Repo]string) // stores the reason repos need to be versioned & released
|
||||||
|
|
||||||
|
@ -134,19 +135,6 @@ func rePrepareRelease() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
master := check.GetMasterVersion()
|
|
||||||
lastTag := check.GetLastTag()
|
|
||||||
|
|
||||||
if argv.Quick != nil {
|
|
||||||
// if argv has 'quick' don't do anything
|
|
||||||
// that doesn't actually have a patch
|
|
||||||
if master == lastTag {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.Info("LAST TAG", check.FullPath, master, lastTag)
|
|
||||||
|
|
||||||
// this is detailed. It makes sure the go.* files are absolutely perfect
|
|
||||||
if !me.forge.Config.IsPrivate(check.GetGoPath()) {
|
if !me.forge.Config.IsPrivate(check.GetGoPath()) {
|
||||||
if err := checkPublishedGodeps(check); err != nil {
|
if err := checkPublishedGodeps(check); err != nil {
|
||||||
// this means the published godeps are no longer up to date
|
// this means the published godeps are no longer up to date
|
||||||
|
@ -160,6 +148,8 @@ func rePrepareRelease() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// if master != lastTag, always increment
|
// if master != lastTag, always increment
|
||||||
|
master := check.GetMasterVersion()
|
||||||
|
lastTag := check.GetLastTag()
|
||||||
if master != lastTag {
|
if master != lastTag {
|
||||||
newmhash := check.GetTagHash(master)
|
newmhash := check.GetTagHash(master)
|
||||||
oldlhash := check.GetTagHash(lastTag)
|
oldlhash := check.GetTagHash(lastTag)
|
||||||
|
@ -196,6 +186,14 @@ func rePrepareRelease() {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if argv.Quick != nil {
|
||||||
|
// if argv has 'quick' don't do anything
|
||||||
|
// that doesn't actually have a patch
|
||||||
|
if master == lastTag {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if argv.Protobuf && check.GetRepoType() == "protobuf" {
|
if argv.Protobuf && check.GetRepoType() == "protobuf" {
|
||||||
log.Printf("NEED RELEASE FOR %s err: %v\n", check.GetGoPath(), "because --protobuf")
|
log.Printf("NEED RELEASE FOR %s err: %v\n", check.GetGoPath(), "because --protobuf")
|
||||||
// if --protobuf, this will force upgrade each one
|
// if --protobuf, this will force upgrade each one
|
||||||
|
@ -221,15 +219,6 @@ func rePrepareRelease() {
|
||||||
|
|
||||||
}
|
}
|
||||||
me.forge.PrintHumanTable(me.found)
|
me.forge.PrintHumanTable(me.found)
|
||||||
// todo: verify each found repo is on the master branch
|
|
||||||
for repo := range me.found.IterAll() {
|
|
||||||
if repo.CurrentBranchName != repo.MasterBranchName {
|
|
||||||
log.Info("repo not on master branch", repo.FullPath)
|
|
||||||
if !argv.Force {
|
|
||||||
os.Exit(-1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func printDone() {
|
func printDone() {
|
||||||
|
|
|
@ -2,15 +2,11 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"go.wit.com/gui"
|
"go.wit.com/gui"
|
||||||
"go.wit.com/log"
|
"go.wit.com/log"
|
||||||
|
|
||||||
"go.wit.com/lib/gadgets"
|
"go.wit.com/lib/gadgets"
|
||||||
"go.wit.com/lib/gui/shell"
|
"go.wit.com/lib/gui/repolist"
|
||||||
"go.wit.com/lib/protobuf/gitpb"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type releaseStruct struct {
|
type releaseStruct struct {
|
||||||
|
@ -32,7 +28,7 @@ type releaseStruct struct {
|
||||||
checkDirtyB *gui.Node
|
checkDirtyB *gui.Node
|
||||||
sendVersionB *gui.Node
|
sendVersionB *gui.Node
|
||||||
checkSafeB *gui.Node
|
checkSafeB *gui.Node
|
||||||
// whitelist map[string]*repolist.RepoRow
|
whitelist map[string]*repolist.RepoRow
|
||||||
}
|
}
|
||||||
|
|
||||||
func (w *autoType) Disable() {
|
func (w *autoType) Disable() {
|
||||||
|
@ -51,18 +47,15 @@ func createReleaseBox(box *gui.Node) {
|
||||||
|
|
||||||
me.release.releaseVersionB = me.release.grid.NewButton("release version", func() {
|
me.release.releaseVersionB = me.release.grid.NewButton("release version", func() {
|
||||||
buttonDisable()
|
buttonDisable()
|
||||||
fpath := me.current.FullPath
|
|
||||||
if err := doRelease(); err == nil {
|
if err := doRelease(); err == nil {
|
||||||
buttonEnable()
|
buttonEnable()
|
||||||
log.Info("doRelease() worked", fpath)
|
log.Info("doRelease() worked")
|
||||||
} else {
|
} else {
|
||||||
log.Info("doRelease() failed", err, fpath)
|
log.Info("doRelease() failed", err)
|
||||||
log.Info("doRelease() FAILED", err, fpath)
|
log.Info("doRelease() FAILED", err)
|
||||||
log.Info("doRelease() FAILED", err, fpath)
|
log.Info("doRelease() FAILED", err)
|
||||||
log.Info("doRelease() FAILED", err, fpath)
|
log.Info("doRelease() FAILED", err)
|
||||||
}
|
}
|
||||||
skipToNext()
|
|
||||||
me.forge.PrintHumanTable(me.found)
|
|
||||||
})
|
})
|
||||||
me.release.grid.NewButton("Find Next", func() {
|
me.release.grid.NewButton("Find Next", func() {
|
||||||
me.Disable()
|
me.Disable()
|
||||||
|
@ -84,6 +77,14 @@ func createReleaseBox(box *gui.Node) {
|
||||||
me.release.grid.NextRow()
|
me.release.grid.NextRow()
|
||||||
|
|
||||||
me.release.repo = gadgets.NewOneLiner(me.release.grid, "repo")
|
me.release.repo = gadgets.NewOneLiner(me.release.grid, "repo")
|
||||||
|
/*
|
||||||
|
me.release.openrepo = me.release.grid.NewButton("Configure", func() {
|
||||||
|
if repov := me.repos.View.FindByPath(me.current.GetGoPath()); repov != nil {
|
||||||
|
repov.Status.Toggle()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
me.release.openrepo.Disable()
|
||||||
|
*/
|
||||||
me.release.grid.NextRow()
|
me.release.grid.NextRow()
|
||||||
me.release.status = gadgets.NewOneLiner(me.release.grid, "status")
|
me.release.status = gadgets.NewOneLiner(me.release.grid, "status")
|
||||||
me.release.grid.NextRow()
|
me.release.grid.NextRow()
|
||||||
|
@ -105,69 +106,41 @@ func createReleaseBox(box *gui.Node) {
|
||||||
me.release.grid.NextRow()
|
me.release.grid.NextRow()
|
||||||
|
|
||||||
// me.userHomePwd.SetText(homeDir)
|
// me.userHomePwd.SetText(homeDir)
|
||||||
me.goSrcPwd.SetText(me.forge.Config.ReposDir)
|
me.goSrcPwd.SetText(me.forge.GetGoSrc())
|
||||||
|
|
||||||
group := me.release.box.NewGroup("Run on Current Repo")
|
group := me.release.box.NewGroup("Run on Current Repo")
|
||||||
grid := group.NewGrid("buildOptions", 0, 0)
|
grid := group.NewGrid("buildOptions", 0, 0)
|
||||||
|
|
||||||
|
/*
|
||||||
|
grid.NewButton("whitelist", func() {
|
||||||
|
})
|
||||||
|
*/
|
||||||
|
|
||||||
grid.NextRow()
|
grid.NextRow()
|
||||||
|
|
||||||
group = me.release.box.NewGroup("Publish until done")
|
group = me.release.box.NewGroup("Publish until done")
|
||||||
grid = group.NewGrid("buildOptions", 0, 0)
|
grid = group.NewGrid("buildOptions", 0, 0)
|
||||||
grid.NewButton("doRelease() all", func() {
|
grid.NewButton("doRelease() all", func() {
|
||||||
buttonDisable()
|
buttonDisable()
|
||||||
doReleaseAll()
|
count := 0
|
||||||
|
for {
|
||||||
|
log.Info("START doRelease() LOOP count =", count, "len me.done =", len(me.done))
|
||||||
|
if err := doRelease(); err != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
count += 1
|
||||||
|
// never allow a loop longer than all the known repos
|
||||||
|
// this probably doesn't matter, but often this code is wrong
|
||||||
|
if count > me.forge.Repos.Len() {
|
||||||
|
// so this is a safety check. never remove this check.
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
buttonEnable()
|
buttonEnable()
|
||||||
})
|
})
|
||||||
grid.NextRow()
|
grid.NextRow()
|
||||||
}
|
}
|
||||||
|
|
||||||
func doReleaseAll() {
|
|
||||||
count := 0
|
|
||||||
for {
|
|
||||||
log.Info("START doRelease() LOOP count =", count, "len me.done =", len(me.done))
|
|
||||||
if err := doRelease(); err != nil {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if err := skipToNext(); err != nil {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
count += 1
|
|
||||||
if count > me.forge.Repos.Len() {
|
|
||||||
// never allow a loop longer than all the known repos
|
|
||||||
// this probably doesn't matter, but often this code is wrong
|
|
||||||
// so this is a safety check. never remove this check.
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func skipToNext() error {
|
|
||||||
shell.RunVerbose([]string{"forge", "dirty"})
|
|
||||||
log.Info("Sleeping for 2 seconds for no reason.")
|
|
||||||
time.Sleep(1)
|
|
||||||
me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
|
|
||||||
me.found = new(gitpb.Repos)
|
|
||||||
|
|
||||||
me.current.ReloadCheck()
|
|
||||||
me.forge.SetConfigSave(true)
|
|
||||||
me.forge.ConfigSave()
|
|
||||||
log.Info("sleep 2")
|
|
||||||
time.Sleep(2 * time.Second)
|
|
||||||
printDone()
|
|
||||||
|
|
||||||
rePrepareRelease()
|
|
||||||
findNext()
|
|
||||||
if me.current == nil {
|
|
||||||
log.Info("NOT GOOD TO RUN ANOTHER DAY")
|
|
||||||
log.Info("took out all the loop code")
|
|
||||||
setCurrentRepo(nil, "loop by hand motherfucker", "fucknuts")
|
|
||||||
return fmt.Errorf("findNext returned next repo == nil")
|
|
||||||
}
|
|
||||||
log.Info("GOOD TO RUN ANOTHER DAY ON:", me.current.GetGoPath())
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func buttonDisable() {
|
func buttonDisable() {
|
||||||
me.Disable()
|
me.Disable()
|
||||||
me.release.box.Disable()
|
me.release.box.Disable()
|
||||||
|
|
|
@ -5,7 +5,6 @@ import (
|
||||||
"go.wit.com/dev/alexflint/arg"
|
"go.wit.com/dev/alexflint/arg"
|
||||||
"go.wit.com/gui"
|
"go.wit.com/gui"
|
||||||
"go.wit.com/lib/gadgets"
|
"go.wit.com/lib/gadgets"
|
||||||
"go.wit.com/lib/gui/prep"
|
|
||||||
"go.wit.com/lib/protobuf/forgepb"
|
"go.wit.com/lib/protobuf/forgepb"
|
||||||
"go.wit.com/lib/protobuf/gitpb"
|
"go.wit.com/lib/protobuf/gitpb"
|
||||||
)
|
)
|
||||||
|
@ -14,7 +13,7 @@ var me *autoType
|
||||||
|
|
||||||
type autoType struct {
|
type autoType struct {
|
||||||
pp *arg.Parser // for parsing the command line args. Yay to alexf lint!
|
pp *arg.Parser // for parsing the command line args. Yay to alexf lint!
|
||||||
myGui *prep.GuiPrep // the gui handle itself
|
myGui *gui.Node // the gui handle itself
|
||||||
releaseReasonS string // = "gocui dropdown select"
|
releaseReasonS string // = "gocui dropdown select"
|
||||||
release releaseStruct // notsure
|
release releaseStruct // notsure
|
||||||
reposbox *gui.Node // notsure
|
reposbox *gui.Node // notsure
|
||||||
|
|
Loading…
Reference in New Issue