Skip to content

Commit 9d3a554

Browse files
author
notzippy@gmail.com
committed
Updates
Updated NotVendored flag Updated travis matrix Updated build log
1 parent 36bd6b9 commit 9d3a554

File tree

3 files changed

+11
-21
lines changed

3 files changed

+11
-21
lines changed

.travis.yml

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ language: go
22

33
go:
44
- "1.12.x"
5-
# - "1.13.x"
6-
# - "1.14.x"
7-
# - "tip"
5+
- "1.13.x"
6+
- "1.14.x"
7+
- "tip"
88

99
os:
10-
# - osx
10+
- osx
1111
- linux
12-
# - windows
12+
- windows
1313

1414
sudo: false
1515

@@ -19,22 +19,22 @@ branches:
1919
- develop
2020

2121
env:
22+
# Setting environments variables
2223
- GO111MODULE=on
2324

2425
install:
25-
# Setting environments variables
2626
- export PATH=$PATH:$HOME/gopath/bin
2727
- export REVEL_BRANCH="develop"
2828
- 'if [[ "$TRAVIS_BRANCH" == "master" ]]; then export REVEL_BRANCH="master"; fi'
2929
- 'echo "Travis branch: $TRAVIS_BRANCH, Revel dependency branch: $REVEL_BRANCH"'
30-
#- git clone -b $REVEL_BRANCH git://github.com/revel/revel ../revel/
31-
#- git clone -b $REVEL_BRANCH git://github.com/revel/modules ../modules/
3230
# Since travis already checks out go build the commandline tool (revel)
33-
- go get -t -v github.com/revel/cmd/revel
31+
- go get -v github.com/revel/cmd/revel
3432
- echo $GOPATH
3533
- echo $PATH
3634
- pwd
3735
script:
36+
- go test -v github.com/revel/cmd/revel/...
37+
3838
# Ensure the new-app flow works (plus the other commands).
3939
#- revel version
4040
#- revel new my/testapp
@@ -54,16 +54,6 @@ script:
5454
- revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v
5555
- revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v -m prod
5656

57-
- revel new --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -v -a my/testapp3 -V
58-
- revel test --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -v -a my/testapp3
59-
- revel clean --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -v -a my/testapp3
60-
- revel build --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp3 -t build/testapp3
61-
- revel build --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp3 -t build/testapp3 -m prod
62-
- revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp3
63-
- revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp3 -m prod
64-
65-
- go test -v github.com/revel/cmd/revel/...
66-
6757
matrix:
6858
allow_failures:
6959
- go: tip

harness/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func Build(c *model.CommandConfig, paths *model.RevelContainer) (_ *App, err err
149149
goModCmd := exec.Command(goPath, append([]string{"mod"}, strings.Split(gomod, " ")...)...)
150150
utils.CmdInit(goModCmd, !c.Vendored, c.AppPath)
151151
output, err := goModCmd.CombinedOutput()
152-
utils.Logger.Infof("Gomod applied ", "output", string(output))
152+
utils.Logger.Info("Gomod applied ", "output", string(output))
153153

154154
// If the build succeeded, we're done.
155155
if err != nil {

model/command/new.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ type (
66
ImportCommand
77
SkeletonPath string `short:"s" long:"skeleton" description:"Path to skeleton folder (Must exist on GO PATH)" required:"false"`
88
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"`
9-
NotVendored bool `short:"V" long:"vendor" description:"True if project should not be configured with a go.mod"`
9+
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"`
1010
Run bool `short:"r" long:"run" description:"True if you want to run the application right away"`
1111
Callback func() error
1212
}

0 commit comments

Comments
 (0)