fixing protobuf handling
Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
parent
6933b29f59
commit
2de5fd7955
10
doRelease.go
10
doRelease.go
|
@ -45,15 +45,19 @@ func doRelease() bool {
|
|||
} else {
|
||||
all = append(all, []string{"git", "add", "-f", "go.sum"})
|
||||
}
|
||||
if ok, files, err := me.current.Status.IsProtobuf(); ok {
|
||||
if ok, compiled, err := me.current.Status.IsProtobuf(); ok {
|
||||
log.Info("\tIsProtobuf() == true")
|
||||
if err != nil {
|
||||
log.Info("\tERROR: There are protobuf files, but they are not compiled")
|
||||
log.Info("\tERROR: can not continue")
|
||||
os.Exit(-1)
|
||||
}
|
||||
log.Info("\tshould add the protobuf files here")
|
||||
log.Info("\tfiles found:", files)
|
||||
//all = append(all, []string{"git", "add", "-f", "go.sum"})
|
||||
log.Info("\tcompiled files found:", compiled)
|
||||
for _, s := range compiled {
|
||||
log.Info("\tcompiled file found:", s)
|
||||
all = append(all, []string{"git", "add", "-f", s})
|
||||
}
|
||||
} else {
|
||||
log.Info("\tIsProtobuf() == false")
|
||||
}
|
||||
|
|
12
http.go
12
http.go
|
@ -187,9 +187,15 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
|
|||
} else {
|
||||
msg(w, "IsPrimitive() == false")
|
||||
}
|
||||
if ok, files, err := me.current.Status.IsProtobuf(); ok {
|
||||
msg(w, log.Sprint("IsProtobuf() == true files = ", files))
|
||||
msg(w, log.Sprint("IsProtobuf() == err", err))
|
||||
if ok, compiled, err := me.current.Status.IsProtobuf(); ok {
|
||||
msg(w, log.Sprint("IsProtobuf() == true compiled protobuf files = ", compiled))
|
||||
if err != nil {
|
||||
msg(w, log.Sprint("IsProtobuf() == err", err))
|
||||
os.Exit(-1)
|
||||
}
|
||||
for _, s := range compiled {
|
||||
log.Info("\tcompiled file found:", s)
|
||||
}
|
||||
} else {
|
||||
msg(w, "IsProtobuf() == false")
|
||||
msg(w, log.Sprint("IsProtobuf() == err", err))
|
||||
|
|
Loading…
Reference in New Issue