Skip to content

[release/1.5 backport] GHA fixes, update GolangCI-Lint v1.42.0, and go-mdman v2.0.1 #6511

Merged
dmcgowan merged 3 commits intocontainerd:release/1.5from
thaJeztah:1.5_backport_golangci_lint_fix
Feb 3, 2022
Merged

[release/1.5 backport] GHA fixes, update GolangCI-Lint v1.42.0, and go-mdman v2.0.1 #6511
dmcgowan merged 3 commits intocontainerd:release/1.5from
thaJeztah:1.5_backport_golangci_lint_fix

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah and others added 3 commits February 3, 2022 22:26
full diff: cpuguy83/go-md2man@v2.0.0...v2.0.1

- Fix handling multiple definition descriptions
- Fix inline markup causing table cells to split
- Remove escaping tilde character (prevents tildes (`~`) from disappearing).
- Do not escape dash, underscore, and ampersand (prevents ampersands (`&`) from disappearing).
- Ignore unknown HTML tags to prevent noisy warnings

Note that this only updates the binaries we install. The vendor code also
includes go-md2man (as indirect dependency of urfave/cli). I don't think we use that
feature, so I did not add it to our go.mod

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d2b6d19)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
For some reason the Linux CI runs end up using go 1.15.14 instead of 1.16.6 for
the Windows runs, or any of the other CI steps. Not sure if this is due to
the linter installing it's own version of go or something else.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
(cherry picked from commit 534685f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
golint has been deprecated and replaced by revive since v1.41.0.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
(cherry picked from commit 4dd5ca7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Copy Markdown
Member Author

Relates to #6509 (comment)

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dmcgowan dmcgowan merged commit 2d28d56 into containerd:release/1.5 Feb 3, 2022
@thaJeztah thaJeztah deleted the 1.5_backport_golangci_lint_fix branch February 4, 2022 01:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants