diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index fe0fc7adb3..96d1b3a938 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -20,7 +20,7 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} - name: Set PATH @@ -46,7 +46,7 @@ jobs: - if: matrix.go == 'stable' && matrix.os == 'ubuntu-latest' run: make v2diff - if: success() && matrix.go == 'stable' && matrix.os == 'ubuntu-latest' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} fail_ci_if_error: true @@ -55,12 +55,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: stable - uses: actions/setup-node@v4 with: - node-version: '16' + node-version: latest - name: Set PATH run: echo "${GITHUB_WORKSPACE}/.local/bin" >>"${GITHUB_PATH}" - run: make ensure-gfmrun diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index cc4019140b..a316c277b3 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -15,11 +15,11 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: - go-version: "1.20" - - uses: actions/checkout@v3 + go-version: stable - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v5 with: - version: latest \ No newline at end of file + version: latest diff --git a/go.mod b/go.mod index 5d7fc32566..584c2c04e1 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.18 require ( github.com/BurntSushi/toml v1.3.2 - github.com/cpuguy83/go-md2man/v2 v2.0.2 - github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 + github.com/cpuguy83/go-md2man/v2 v2.0.4 + github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/go.sum b/go.sum index 9a1b372264..fef97ed608 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,11 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= -github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= +github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe9UDgpxAWQrhbbBXOYJFQDq/dtJw= +github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/testdata/expected-doc-full.man b/testdata/expected-doc-full.man index 615f8d6af4..86de04e47b 100644 --- a/testdata/expected-doc-full.man +++ b/testdata/expected-doc-full.man @@ -10,16 +10,11 @@ greet - Some app .PP greet -.PP -.RS - -.nf +.EX [--another-flag|-b] [--flag|--fl|-f]=[value] [--socket|-s]=[value] - -.fi -.RE +.EE .SH DESCRIPTION @@ -29,14 +24,9 @@ Description of the application. .PP \fBUsage\fP: -.PP -.RS - -.nf +.EX app [first_arg] [second_arg] - -.fi -.RE +.EE .SH GLOBAL OPTIONS @@ -80,10 +70,7 @@ retrieve generic information .PP standard usage text -.PP -.RS - -.nf +.EX Usage for the usage text - formatted: Based on the specified ConfigMap and summon secrets.yml - list: Inspect the environment for a specific process running on a Pod @@ -94,9 +81,7 @@ func() { ... } ``` Should be a part of the same code block - -.fi -.RE +.EE .PP \fB--another-flag, -b\fP: another usage text