Merge pull request #4255 from kolyshkin/golangci-lint-action

ci/gha: bump golangci-lint[-action]
opencontainers · Apr 26, 2024 · c9f624e · c9f624e
2 parents 426c04b + d63018c
commit c9f624e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -34,14 +34,13 @@ 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
+          version: v1.57
       # Extra linters, only checking new code from a pull request.
       - name: lint-extra
         if: github.event_name == 'pull_request'

diff --git 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
 		}