totole/revel-cmd
1
0
Fork 0
mirror of https://github.com/kevin-DL/revel-cmd.git synced 2026-01-11 18:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updates

Browse Source 
Updated NotVendored flag
Updated travis matrix
Updated build log
This commit is contained in:
notzippy@gmail.com
2020-04-29 22:01:28 -07:00
parent 36bd6b944a
commit 9d3a554bec
3 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
.travis.yml
View File

@@ -2,14 +2,14 @@ language: go
go: go:
- "1.12.x" - "1.12.x"
# - "1.13.x" - "1.13.x"
# - "1.14.x" - "1.14.x"
# - "tip" - "tip"
os: os:
# - osx - osx
- linux - linux
# - windows - windows
sudo: false sudo: false
@@ -19,22 +19,22 @@ branches:
- develop - develop
env: env:
# Setting environments variables
- GO111MODULE=on - GO111MODULE=on
install: install:
# Setting environments variables
- export PATH=$PATH:$HOME/gopath/bin - export PATH=$PATH:$HOME/gopath/bin
- export REVEL_BRANCH="develop" - export REVEL_BRANCH="develop"
- 'if [[ "$TRAVIS_BRANCH" == "master" ]]; then export REVEL_BRANCH="master"; fi' - 'if [[ "$TRAVIS_BRANCH" == "master" ]]; then export REVEL_BRANCH="master"; fi'
- 'echo "Travis branch: $TRAVIS_BRANCH, Revel dependency branch: $REVEL_BRANCH"' - '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) # 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 $GOPATH
- echo $PATH - echo $PATH
- pwd - pwd
script: script:
- go test -v github.com/revel/cmd/revel/...
# Ensure the new-app flow works (plus the other commands). # Ensure the new-app flow works (plus the other commands).
#- revel version #- revel version
#- revel new my/testapp #- 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
- revel package --gomod-flags "edit -replace=github.com/revel/revel=github.com/revel/revel@develop" -a my/testapp2 -v -m prod - 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: matrix:
allow_failures: allow_failures:
- go: tip - go: tip

2
harness/build.go
View File

@@ -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, " ")...)...) goModCmd := exec.Command(goPath, append([]string{"mod"}, strings.Split(gomod, " ")...)...)
utils.CmdInit(goModCmd, !c.Vendored, c.AppPath) utils.CmdInit(goModCmd, !c.Vendored, c.AppPath)
output, err := goModCmd.CombinedOutput() 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 the build succeeded, we're done.
if err != nil { if err != nil {

2
model/command/new.go
View File

@@ -6,7 +6,7 @@ type (
ImportCommand ImportCommand
SkeletonPath string `short:"s" long:"skeleton" description:"Path to skeleton folder (Must exist on GO PATH)" required:"false"` 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"` 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"` Run bool `short:"r" long:"run" description:"True if you want to run the application right away"`
Callback func() error Callback func() error
} }