diff --git a/.travis.yml b/.travis.yml index 91d9809..86430d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,14 +2,14 @@ language: go go: - "1.12.x" -# - "1.13.x" -# - "1.14.x" -# - "tip" + - "1.13.x" + - "1.14.x" + - "tip" os: -# - osx + - osx - linux -# - windows + - windows sudo: false @@ -19,22 +19,22 @@ branches: - develop env: + # Setting environments variables - GO111MODULE=on install: - # Setting environments variables - export PATH=$PATH:$HOME/gopath/bin - export REVEL_BRANCH="develop" - 'if [[ "$TRAVIS_BRANCH" == "master" ]]; then export REVEL_BRANCH="master"; fi' - 'echo "Travis branch: $TRAVIS_BRANCH, Revel dependency branch: $REVEL_BRANCH"' - #- git clone -b $REVEL_BRANCH git://github.com/revel/revel ../revel/ - #- git clone -b $REVEL_BRANCH git://github.com/revel/modules ../modules/ # Since travis already checks out go build the commandline tool (revel) - - go get -t -v github.com/revel/cmd/revel + - go get -v github.com/revel/cmd/revel - echo $GOPATH - echo $PATH - pwd script: + - go test -v github.com/revel/cmd/revel/... + # Ensure the new-app flow works (plus the other commands). #- revel version #- revel new my/testapp @@ -54,16 +54,6 @@ script: - 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@develop" -v -a my/testapp3 -V - - revel test --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -v -a my/testapp3 - - revel clean --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -v -a my/testapp3 - - revel build --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp3 -t build/testapp3 - - revel build --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp3 -t build/testapp3 -m prod - - revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp3 - - revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp3 -m prod - - - go test -v github.com/revel/cmd/revel/... - matrix: allow_failures: - go: tip diff --git a/harness/build.go b/harness/build.go index 0184fa3..c271b9e 100644 --- a/harness/build.go +++ b/harness/build.go @@ -149,7 +149,7 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (_ *App, err err goModCmd := exec.Command(goPath, append([]string{"mod"}, strings.Split(gomod, " ")...)...) utils.CmdInit(goModCmd, !c.Vendored, c.AppPath) output, err := goModCmd.CombinedOutput() - utils.Logger.Infof("Gomod applied ", "output", string(output)) + utils.Logger.Info("Gomod applied ", "output", string(output)) // If the build succeeded, we're done. if err != nil { diff --git a/model/command/new.go b/model/command/new.go index 66d88fb..51e2c5e 100644 --- a/model/command/new.go +++ b/model/command/new.go @@ -6,7 +6,7 @@ type ( ImportCommand SkeletonPath string `short:"s" long:"skeleton" description:"Path to skeleton folder (Must exist on GO PATH)" required:"false"` Package string `short:"p" long:"package" description:"The package name, this becomes the repfix to the app name, if defined vendored is set to true" required:"false"` - NotVendored bool `short:"V" long:"vendor" description:"True if project should not be configured with a go.mod"` + NotVendored bool `long:"not-vendor" description:"True if project should not be configured with a go.mod, this requires you to have the project on the GOPATH"` Run bool `short:"r" long:"run" description:"True if you want to run the application right away"` Callback func() error }