diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53c0e9f2f2..60bca334dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - main env: CARGO_TERM_COLOR: always - GO_VERSION: '1.22' + GO_VERSION: '1.23' ACTION_MSRV_TOOLCHAIN: 1.66.1 # Latest available toolchain which does not break clippy and the unit tests ACTION_MSRV_NIGHTLY_TOOLCHAIN: nightly-2024-05-19 @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v4 - uses: golangci/golangci-lint-action@v6 with: - version: v1.59.1 + version: v1.60.3 only-new-issues: true get-script: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bdc38032cd..0be458af33 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: env: CARGO_TERM_COLOR: always - GO_VERSION: '1.22' + GO_VERSION: '1.23' ACTION_MSRV_TOOLCHAIN: 1.66.1 jobs: diff --git a/.golangci.yml b/.golangci.yml index e07b49956d..2dd10dbeeb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -25,7 +25,6 @@ linters: - errname - errorlint - exhaustive - - exportloopref - fatcontext - forbidigo - forcetypeassert @@ -124,6 +123,9 @@ linters-settings: min-complexity: 50 gocyclo: min-complexity: 50 + gosec: + excludes: + - G115 # potential integer overflow nestif: min-complexity: 15 errcheck: diff --git a/Makefile b/Makefile index 42f743eeb1..24583c33b9 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ TEST_FLAGS ?= PACKAGE_NAME ?= $(shell cargo metadata --no-deps --format-version 1 | jq -r '.packages[2] | [ .name, .version ] | join("-v")') PREFIX ?= /usr CI_TAG ?= -GOLANGCI_LINT_VERSION := v1.59.1 +GOLANGCI_LINT_VERSION := v1.60.3 ZEITGEIST_VERSION := v0.4.4 default: diff --git a/dependencies.yaml b/dependencies.yaml index 34a2d7b84e..cd7204d0af 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ --- dependencies: - name: go - version: 1.22 + version: 1.23 refPaths: - path: go.mod match: go @@ -25,7 +25,7 @@ dependencies: match: ACTION_MSRV_NIGHTLY_TOOLCHAIN - name: golangci-lint - version: 1.59.1 + version: 1.60.3 refPaths: - path: .github/workflows/ci.yml match: version diff --git a/go.mod b/go.mod index 838502bd6f..02e561e08f 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containers/conmon-rs -go 1.22 +go 1.23 require ( capnproto.org/go/capnp/v3 v3.0.1-alpha.2 diff --git a/pkg/client/suite_test.go b/pkg/client/suite_test.go index b88ae0b7f9..5e35a46dfd 100644 --- a/pkg/client/suite_test.go +++ b/pkg/client/suite_test.go @@ -344,7 +344,7 @@ func (rr *RuntimeRunner) RunCommand(args ...string) error { return err } if stdoutString != "" { - fmt.Fprintf(GinkgoWriter, stdoutString+"\n") + fmt.Fprintf(GinkgoWriter, "%s\n", stdoutString) } return nil