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

autobuild test 11? 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2024-01-18 17:39:38 -06:00
parent 1928ac7e7c
commit 13beecb0ea
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
globalBuildOptions.go
View File

@ -99,6 +99,7 @@ func globalBuildOptions(box *gui.Node) {
}) })
groupvbox.NewButton("rebuild autotypist", func() { groupvbox.NewButton("rebuild autotypist", func() {
os.Setenv("GO111MODULE", "off")
quickCmdDoNotRun = true quickCmdDoNotRun = true
quickCmdLastPath = "~/go/src" quickCmdLastPath = "~/go/src"
quickCmds = [][]string{} quickCmds = [][]string{}
@ -107,13 +108,14 @@ func globalBuildOptions(box *gui.Node) {
quickCmd(fullpath, []string{"mkdir", "-p", "go.wit.com/apps/"}) quickCmd(fullpath, []string{"mkdir", "-p", "go.wit.com/apps/"})
fullpath = "/home/jcarr/go/src/go.wit.com/apps/autotypist" fullpath = "/home/jcarr/go/src/go.wit.com/apps/autotypist"
quickCmd(fullpath, []string{"go", "get", "-v", "-u", "go.wit.com/apps/autotypist"}) quickCmd(fullpath, []string{"go", "get", "-v", "go.wit.com/apps/autotypist"})
quickCmd(fullpath, []string{"go", "get", "-v", "-u", "go.wit.com/toolkits/debian"}) quickCmd(fullpath, []string{"go", "get", "-v", "go.wit.com/toolkits/debian"})
fullpath = "/home/jcarr/go/src/go.wit.com/toolkits/debian" fullpath = "/home/jcarr/go/src/go.wit.com/toolkits/debian"
quickCmd(fullpath, []string{"make"}) quickCmd(fullpath, []string{"make"})
fullpath = "/home/jcarr/go/src/go.wit.com/apps/autotypist" fullpath = "/home/jcarr/go/src/go.wit.com/apps/autotypist"
quickCmd(fullpath, []string{"go", "get", "-v", "-u", "."})
quickCmd(fullpath, []string{"go", "-v", "-x", "build"}) quickCmd(fullpath, []string{"go", "-v", "-x", "build"})
me.script = quickCmds me.script = quickCmds
setGitCommands() setGitCommands()

17
unix.go
View File

@ -12,7 +12,7 @@ var repopath string = "/home/jcarr/"
// if dryRun == true, then it just prints out the values // if dryRun == true, then it just prints out the values
// but doesn't do anything // but doesn't do anything
func goMake(dryRun string) bool { func goMake(dryRun string) bool {
var workingPath string = "go/src" var workingpath string = "~/go/src"
for _, line := range me.script { for _, line := range me.script {
if len(line) == 0 { if len(line) == 0 {
continue continue
@ -20,11 +20,11 @@ func goMake(dryRun string) bool {
if line[0] == "cd" { if line[0] == "cd" {
switch len(line) { switch len(line) {
case 1: case 1:
log.Verbose("do cmdPwd() to go root", repopath+"go/src") log.Verbose("do cmdPwd() TODO: change working path to ~ ?")
workingPath = "" workingpath = "/home/jcarr/go/src/go.wit.com/"
case 2: case 2:
log.Verbose("do cmdPwd() here", line) log.Verbose("do cmdPwd() here", line)
workingPath = line[1] workingpath = line[1]
default: default:
log.Warn("bad cd", line) log.Warn("bad cd", line)
return false return false
@ -33,19 +33,18 @@ func goMake(dryRun string) bool {
} }
cmd := line[0] cmd := line[0]
s := strings.Join(line[1:], " ") s := strings.Join(line[1:], " ")
path := repopath + workingPath log.Warn("NEED TO RUN path =", workingpath, "cmd =", cmd, s)
log.Warn("NEED TO RUN path =", path, "cmd =", cmd, s)
if dryRun == "--dry-run" { if dryRun == "--dry-run" {
continue continue
} }
if dryRun == "--doit" { if dryRun == "--doit" {
log.Warn("Actually RUN path =", path, "cmd =", cmd, s) log.Warn("Actually RUN path =", workingpath, "cmd =", cmd, s)
err, b, output := repostatus.RunCmd(path, line) err, b, output := repostatus.RunCmd(workingpath, line)
if err != nil { if err != nil {
log.Info("output =", output)
log.Info("ABEND EXECUTION") log.Info("ABEND EXECUTION")
log.Info("error =", err) log.Info("error =", err)
log.Info("b =", b) log.Info("b =", b)
log.Info("output =", output)
return false return false
} }
// log.Warn("output was =", output) // log.Warn("output was =", output)