diff --git a/.travis.yml b/.travis.yml index cd9a671..907e2d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,13 +47,13 @@ script: #- revel package my/testapp prod # Ensure the new-app flow works (plus the other commands). - - revel new --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 --package revelframework.com -v - - revel test --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v - - revel clean --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v - - revel build --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v -t build/testapp2 - - revel build --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v -t build/testapp2 -m prod - - revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v - - revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v -m prod + - revel new --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 --package revelframework.com -v + - revel test --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 -v + - revel clean --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 -v + - revel build --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 -v -t build/testapp2 + - revel build --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 -v -t build/testapp2 -m prod + - revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 -v + - revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 -v -m prod # Check build works with no-vendor flag - cd $GOPATH @@ -61,6 +61,10 @@ script: - revel new -a my/testapp2 --no-vendor -v - revel test -a my/testapp2 -v + # Check non verbose build + - revel new --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 --package revelframework.com + - revel test --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@$REVEL_BRANCH" -a my/testapp2 + matrix: allow_failures: - go: tip diff --git a/model/command_config.go b/model/command_config.go index aa172f3..41a055b 100644 --- a/model/command_config.go +++ b/model/command_config.go @@ -236,6 +236,7 @@ func (c *CommandConfig) InitPackageResolver() { utils.Logger.Info("Request for package ", "package", pkgName, "use vendor", c.Vendored) var getCmd *exec.Cmd if c.Vendored { + println("Downloading related packages") getCmd = exec.Command(c.GoCmd, "mod", "tidy") } else { utils.Logger.Info("No vendor folder detected, not using dependency manager to import package", "package", pkgName) @@ -245,6 +246,7 @@ func (c *CommandConfig) InitPackageResolver() { utils.CmdInit(getCmd, !c.Vendored, c.AppPath) utils.Logger.Info("Go get command ", "exec", getCmd.Path, "dir", getCmd.Dir, "args", getCmd.Args, "env", getCmd.Env, "package", pkgName) output, err := getCmd.CombinedOutput() + println("Downloading related packages completed") if err != nil { utils.Logger.Error("Failed to import package", "error", err, "gopath", build.Default.GOPATH, "GO-ROOT", build.Default.GOROOT, "output", string(output)) } diff --git a/parser2/source_processor.go b/parser2/source_processor.go index dae3f39..00ef0f4 100644 --- a/parser2/source_processor.go +++ b/parser2/source_processor.go @@ -46,9 +46,11 @@ func NewSourceProcessor(revelContainer *model.RevelContainer) *SourceProcessor { } func (s *SourceProcessor) parse() (compileError error) { + print("Parsing packages, (may require download if not cached)...") if compileError = s.addPackages(); compileError != nil { return } + println(" Completed") if compileError = s.addImportMap(); compileError != nil { return }