From 6bcc73612281bcceac892375fdd68ed298cedd15 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 25 Apr 2024 08:25:02 -0700 Subject: [PATCH 1/3] ci/gha: bump golangci/golangci-lint-action to v5 Since v5 removes caching [1], re-enable setup-go cache. [1] https://github.com/golangci/golangci-lint-action/pull/1024 Signed-off-by: Kir Kolyshkin --- .github/workflows/validate.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index ca468223fc7..b4d43811c78 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -34,12 +34,11 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "${{ env.GO_VERSION }}" - cache: false # golangci-lint-action does its own caching - name: install deps run: | sudo apt -q update sudo apt -qy install libseccomp-dev - - uses: golangci/golangci-lint-action@v4 + - uses: golangci/golangci-lint-action@v5 with: version: v1.54 # Extra linters, only checking new code from a pull request. From 0eb8bb5f6683851cbd7ee2485238101827ac3eac Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 25 Apr 2024 08:38:49 -0700 Subject: [PATCH 2/3] Format sources with gofumpt v0.6 Signed-off-by: Kir Kolyshkin --- libcontainer/init_linux.go | 1 - 1 file changed, 1 deletion(-) diff --git a/libcontainer/init_linux.go b/libcontainer/init_linux.go index 591981e9874..bd89b253d5a 100644 --- a/libcontainer/init_linux.go +++ b/libcontainer/init_linux.go @@ -399,7 +399,6 @@ func setupConsole(socket *os.File, config *initConfig, mount bool) error { Height: config.ConsoleHeight, Width: config.ConsoleWidth, }) - if err != nil { return err } From d63018c2524e1767b6f3b55046f6e748139e0cc2 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 25 Apr 2024 08:28:45 -0700 Subject: [PATCH 3/3] ci/gha: bump golangci-lint to v1.57 Signed-off-by: Kir Kolyshkin --- .github/workflows/validate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index b4d43811c78..5e131916dac 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -40,7 +40,7 @@ jobs: sudo apt -qy install libseccomp-dev - uses: golangci/golangci-lint-action@v5 with: - version: v1.54 + version: v1.57 # Extra linters, only checking new code from a pull request. - name: lint-extra if: github.event_name == 'pull_request'