on merge success, switch to master and exit
This commit is contained in:
parent
9c7ef1a831
commit
2221e362a8
2
Makefile
2
Makefile
|
@ -5,7 +5,7 @@ all: build
|
||||||
# reset
|
# reset
|
||||||
# ./autotypist
|
# ./autotypist
|
||||||
|
|
||||||
build:
|
build: goimports
|
||||||
echo "build it!"
|
echo "build it!"
|
||||||
@# copy the toolkits into the binary during debugging
|
@# copy the toolkits into the binary during debugging
|
||||||
-rm resources/*.so
|
-rm resources/*.so
|
||||||
|
|
|
@ -3,6 +3,7 @@ package main
|
||||||
import (
|
import (
|
||||||
"go.wit.com/lib/gadgets"
|
"go.wit.com/lib/gadgets"
|
||||||
"go.wit.com/lib/gui/repolist"
|
"go.wit.com/lib/gui/repolist"
|
||||||
|
"go.wit.com/lib/gui/shell"
|
||||||
"go.wit.com/log"
|
"go.wit.com/log"
|
||||||
|
|
||||||
"go.wit.com/gui"
|
"go.wit.com/gui"
|
||||||
|
@ -152,7 +153,6 @@ func (r *repoWindow) repoMenu() *gui.Node {
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
return box2
|
return box2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -184,7 +184,11 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
|
||||||
}
|
}
|
||||||
repo.NewScan()
|
repo.NewScan()
|
||||||
}
|
}
|
||||||
log.Warn("EVERYTHING WORKED")
|
log.Warn("EVERYTHING WORKED. with merge to master")
|
||||||
|
cmd := []string{"forge", "user"}
|
||||||
|
shell.Run(cmd)
|
||||||
|
cmd = []string{"forge", "list"}
|
||||||
|
shell.Run(cmd)
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue