Skip to content

Commit

Permalink
Switch to go 1.23
Browse files Browse the repository at this point in the history
Signed-off-by: Sascha Grunert <[email protected]>
  • Loading branch information
saschagrunert committed Sep 3, 2024
1 parent a318ade commit 870ab5d
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ linters:
- errname
- errorlint
- exhaustive
- exportloopref
- fatcontext
- forbidigo
- forcetypeassert
Expand Down Expand Up @@ -124,6 +123,9 @@ linters-settings:
min-complexity: 50
gocyclo:
min-complexity: 50
gosec:
excludes:
- G115 # potential integer overflow
nestif:
min-complexity: 15
errcheck:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
dependencies:
- name: go
version: 1.22
version: 1.23
refPaths:
- path: go.mod
match: go
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 870ab5d

Please sign in to comment.