Merge branch 'master' of https://github.com/urfave/cli

urfave · Jan 6, 2021 · fc1d3eb · fc1d3eb
2 parents ea14b62 + 2e9dc40
commit fc1d3eb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -11,7 +11,6 @@ on:
       - v1
 
 jobs:
-
   test:
     strategy:
       matrix:
@@ -27,10 +26,10 @@ jobs:
 
       - name: Set GOPATH, PATH and ENV
         run: |
-          echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)"
-          echo "::set-env name=GO111MODULE::on"
-          echo "::set-env name=GOPROXY::https://proxy.golang.org"
-          echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin"
+          echo "GOPATH=$(dirname $GITHUB_WORKSPACE)" >> $GITHUB_ENV
+          echo "GO111MODULE=on" >> $GITHUB_ENV
+          echo "GOPROXY=https://proxy.golang.org" >> $GITHUB_ENV
+          echo "$(dirname $GITHUB_WORKSPACE)/bin" >> $GITHUB_PATH
         shell: bash
 
       - name: Checkout Code
@@ -74,10 +73,10 @@ jobs:
 
       - name: Set GOPATH, PATH and ENV
         run: |
-          echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)"
-          echo "::set-env name=GO111MODULE::on"
-          echo "::set-env name=GOPROXY::https://proxy.golang.org"
-          echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin"
+          echo "GOPATH=$(dirname $GITHUB_WORKSPACE)" >> $GITHUB_ENV
+          echo "GO111MODULE=on" >> $GITHUB_ENV
+          echo "GOPROXY=https://proxy.golang.org" >> $GITHUB_ENV
+          echo "$(dirname $GITHUB_WORKSPACE)/bin" >> $GITHUB_PATH
         shell: bash
 
       - name: Checkout Code

diff --git a/app.go b/app.go
@@ -328,7 +328,7 @@ func (a *App) RunContext(ctx context.Context, arguments []string) (err error) {
 // RunAndExitOnError calls .Run() and exits non-zero if an error was returned
 //
 // Deprecated: instead you should return an error that fulfills cli.ExitCoder
-// to cli.App.Run. This will cause the application to exit with the given eror
+// to cli.App.Run. This will cause the application to exit with the given error
 // code in the cli.ExitCoder
 func (a *App) RunAndExitOnError() {
 	if err := a.Run(os.Args); err != nil {

diff --git a/docs/v2/manual.md b/docs/v2/manual.md
@@ -45,7 +45,7 @@ cli v2 manual
 There are a small set of breaking changes between v1 and v2.
 Converting is relatively straightforward and typically takes less than
 an hour. Specific steps are included in
-[Migration Guide: v1 to v2](../migrate-v1-to-v2.md).
+[Migration Guide: v1 to v2](../migrate-v1-to-v2.md). Also see the [pkg.go.dev docs](https://pkg.go.dev/github.com/urfave/cli/v2) for v2 API documentation.
 
 ## Getting Started