diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 082dc87..90fcf19 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -4,15 +4,15 @@ on: [pull_request] jobs: lint: name: runner / golangci-lint - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 30 steps: - name: Install go - uses: actions/setup-go@v4 + uses: actions/setup-go@v6 with: - go-version: 'v1.20' + go-version: 'v1.24' - name: Check out code - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: golanci-lint uses: upfluence/action-golangci-lint@master with: diff --git a/x/cli/app.go b/x/cli/app.go index def04a6..76fc572 100644 --- a/x/cli/app.go +++ b/x/cli/app.go @@ -99,8 +99,9 @@ func (a *App) commandContext() CommandContext { cmds, flags = a.parseArgs() args = make(map[string]string) ps = append( - []provider.Provider{pflags.NewProvider(flags), argProvider(args)}, - a.ps..., + a.ps, + pflags.NewProvider(flags), + argProvider(args), ) )