Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

services/serve: wait for a fix on build error #119

Merged
merged 4 commits into from
Aug 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ require (
github.com/gobuffalo/plush v3.8.3+incompatible
github.com/gobuffalo/plushgen v0.1.2
github.com/goccy/go-yaml v1.8.0
github.com/gookit/color v1.2.7
github.com/gorilla/mux v1.7.4
github.com/ilgooz/analytics-go v3.1.1-0.20200723195510-acde4190c655+incompatible
github.com/karrick/godirwalk v1.15.6 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/gookit/color v1.2.7 h1:4qePMNWZhrmbfYJDix+J4V2l0iVW+6jQGjicELlN14E=
github.com/gookit/color v1.2.7/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg=
github.com/gorilla/mux v1.7.4 h1:VuZ8uybHlWmqV03+zRzdwKL4tUnIp1MAQtp1mIFE1bc=
github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
Expand Down
60 changes: 52 additions & 8 deletions starport/services/serve/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"time"

"github.com/go-git/go-git/v5"
"github.com/gookit/color"
"github.com/pkg/errors"
"github.com/tendermint/starport/starport/pkg/cmdrunner"
"github.com/tendermint/starport/starport/pkg/cmdrunner/step"
Expand All @@ -31,6 +32,9 @@ var (
"cmd",
"x",
}

errorColor = color.Red.Render
infoColor = color.Yellow.Render
)

type App struct {
Expand Down Expand Up @@ -83,9 +87,16 @@ func Serve(ctx context.Context, app App, conf starportconf.Config, verbose bool)
case <-s.serveRefresher:
var serveCtx context.Context
serveCtx, s.serveCancel = context.WithCancel(ctx)
if err := s.serve(serveCtx); err != nil && err != context.Canceled {
return err
err := s.serve(serveCtx)
if err == nil || err == context.Canceled {
continue
}
if _, ok := err.(*CannotBuildAppError); ok {
fmt.Fprintf(os.Stderr, "%s\n", errorColor(err.Error()))
fmt.Printf("%s\n", infoColor("waiting for a fix before retrying..."))
continue
}
return err
}
}
})
Expand Down Expand Up @@ -158,7 +169,15 @@ func (s *starportServe) buildSteps() (steps step.Steps) {

appd = s.app.Name + "d"
appcli = s.app.Name + "cli"

buildErr = &bytes.Buffer{}
)
captureBuildErr := func(exitErr error) error {
if exitErr != nil {
return &CannotBuildAppError{Log: buildErr.String()}
}
return nil
}
steps.Add(step.New(
step.Exec("go", "mod", "tidy"),
step.PreExec(func() error {
Expand All @@ -168,14 +187,31 @@ func (s *starportServe) buildSteps() (steps step.Steps) {
fmt.Println("\n📦 Installing dependencies...")
return nil
}),
step.PostExec(func(exitErr error) error {
return errors.Wrap(exitErr, "cannot install go modules")
}),
step.PostExec(captureBuildErr),
step.Stderr(buildErr),
))
steps.Add(step.New(step.Exec("go", "mod", "verify")))
steps.Add(step.New(
step.Exec("go", "mod", "verify"),
step.PostExec(captureBuildErr),
step.Stderr(buildErr),
))

cwd, _ := os.Getwd()
steps.Add(step.New(step.Exec("go", "install", "-mod", "readonly", "-ldflags", ldflags, filepath.Join(cwd, "cmd", appd))))
steps.Add(step.New(step.Exec("go", "install", "-mod", "readonly", "-ldflags", ldflags, filepath.Join(cwd, "cmd", appcli))))

steps.Add(step.New(
step.Exec("go", "install", "-mod", "readonly", "-ldflags", ldflags, filepath.Join(cwd, "cmd", appd)),
step.PreExec(func() error {
fmt.Println("🛠️ Building the app...")
return nil
}),
step.PostExec(captureBuildErr),
step.Stderr(buildErr),
))
steps.Add(step.New(
step.Exec("go", "install", "-mod", "readonly", "-ldflags", ldflags, filepath.Join(cwd, "cmd", appcli)),
step.PostExec(captureBuildErr),
step.Stderr(buildErr),
))
steps.Add(step.New(
step.Exec(appd, "init", "mynode", "--chain-id", ndapp),
step.PreExec(func() error {
Expand Down Expand Up @@ -323,3 +359,11 @@ func (s *starportServe) appVersion() (v version, err error) {
v.hash = ref.Hash().String()
return v, nil
}

type CannotBuildAppError struct {
Log string
}

func (e *CannotBuildAppError) Error() string {
return fmt.Sprintf("cannot build app:\n\n\t%s", e.Log)
}