Merge branch 'master' into master

This commit is contained in:
Martin Lees 2019-12-16 12:07:37 +01:00 committed by GitHub
commit 4033b7f079
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 9 deletions

View File

@ -58,8 +58,9 @@ jobs:
go run build.go gfmrun docs/v2/manual.md go run build.go gfmrun docs/v2/manual.md
go run build.go toc docs/v2/manual.md go run build.go toc docs/v2/manual.md
- name: Send Coverage Report - name: Upload coverage to Codecov
if: success() if: success() && matrix.go == 1.13 && matrix.os == 'ubuntu-latest'
env: uses: codecov/codecov-action@v1
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} with:
run: bash <(curl -s https://codecov.io/bash) token: 0a8cc73b-bb7c-480b-8626-38a461643761
fail_ci_if_error: true

2
app.go
View File

@ -13,7 +13,7 @@ import (
) )
var ( var (
changeLogURL = "https://github.com/urfave/cli/blob/master/CHANGELOG.md" changeLogURL = "https://github.com/urfave/cli/blob/master/docs/CHANGELOG.md"
appActionDeprecationURL = fmt.Sprintf("%s#deprecated-cli-app-action-signature", changeLogURL) appActionDeprecationURL = fmt.Sprintf("%s#deprecated-cli-app-action-signature", changeLogURL)
contactSysadmin = "This is an error in the application. Please contact the distributor of this application if this is not you." contactSysadmin = "This is an error in the application. Please contact the distributor of this application if this is not you."
errInvalidActionType = NewExitError("ERROR invalid Action type. "+ errInvalidActionType = NewExitError("ERROR invalid Action type. "+

View File

@ -20,7 +20,6 @@ install:
- go version - go version
- go env - go env
- go get github.com/urfave/gfmrun/cmd/gfmrun - go get github.com/urfave/gfmrun/cmd/gfmrun
- go get golang.org/x/tools/cmd/goimports
- go mod tidy - go mod tidy
build_script: build_script:

View File

@ -1,5 +1,6 @@
package cli package cli
// CommandCategories interface allows for category manipulation
type CommandCategories interface { type CommandCategories interface {
// AddCommand adds a command to a category, creating a new category if necessary. // AddCommand adds a command to a category, creating a new category if necessary.
AddCommand(category string, command *Command) AddCommand(category string, command *Command)

View File

@ -48,6 +48,7 @@ func (m *multiError) Errors() []error {
return errs return errs
} }
// ErrorFormatter is the interface that will suitably format the error output
type ErrorFormatter interface { type ErrorFormatter interface {
Format(s fmt.State, verb rune) Format(s fmt.State, verb rune)
} }

View File

@ -72,7 +72,7 @@ func (f *PathFlag) Apply(set *flag.FlagSet) error {
return nil return nil
} }
// String looks up the value of a local PathFlag, returns // Path looks up the value of a local PathFlag, returns
// "" if not found // "" if not found
func (c *Context) Path(name string) string { func (c *Context) Path(name string) string {
if fs := lookupFlagSet(name, c); fs != nil { if fs := lookupFlagSet(name, c); fs != nil {