From 3eeb50d48b9d0bd5b4413a5d00ecad3e24cbbac7 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 16 Nov 2022 10:43:23 +0100 Subject: [PATCH 1/2] Bump golang version to 1.18 Signed-off-by: Evan Lezar --- Makefile | 4 ++-- go.mod | 2 +- test/tools/go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index eea9a563e8..fcfc838c48 100644 --- a/Makefile +++ b/Makefile @@ -286,7 +286,7 @@ build-all-new-commits: .PHONY: vendor vendor: - $(GO) mod tidy -compat=1.17 + $(GO) mod tidy -compat=1.18 $(GO) mod vendor $(GO) mod verify @@ -302,7 +302,7 @@ $(IN_CONTAINER): %-in-container: $(PODMANCMD) run --rm --env HOME=/root \ -v $(CURDIR):/src -w /src \ --security-opt label=disable \ - docker.io/library/golang:1.17 \ + docker.io/library/golang:1.18 \ make $(*) diff --git a/go.mod b/go.mod index 0f8b749f7a..e24be9a4b8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containers/podman/v4 -go 1.17 +go 1.18 require ( github.com/BurntSushi/toml v1.2.1 diff --git a/test/tools/go.mod b/test/tools/go.mod index 144495127b..1a76034082 100644 --- a/test/tools/go.mod +++ b/test/tools/go.mod @@ -1,6 +1,6 @@ module github.com/containers/podman/test/tools -go 1.17 +go 1.18 require ( github.com/cpuguy83/go-md2man/v2 v2.0.2 From dce7b3a5b92b42af676b93082ab69972703c3cb4 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 24 Nov 2022 16:44:15 +0100 Subject: [PATCH 2/2] Address golangci-lint issues Signed-off-by: Evan Lezar --- libpod/oci_conmon_common.go | 2 +- pkg/machine/e2e/config_init_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libpod/oci_conmon_common.go b/libpod/oci_conmon_common.go index f5acf079d9..b82d2e7638 100644 --- a/libpod/oci_conmon_common.go +++ b/libpod/oci_conmon_common.go @@ -1438,7 +1438,7 @@ func readConmonPipeData(runtimeName string, pipe *os.File, ociLog string) (int, ch <- syncStruct{si: si} }() - data := -1 //nolint: wastedassign + data := -1 select { case ss := <-ch: if ss.err != nil { diff --git a/pkg/machine/e2e/config_init_test.go b/pkg/machine/e2e/config_init_test.go index 305d101a39..43313ad2f9 100644 --- a/pkg/machine/e2e/config_init_test.go +++ b/pkg/machine/e2e/config_init_test.go @@ -27,7 +27,7 @@ type initMachine struct { memory *uint now bool timezone string - rootful bool //nolint:unused,structcheck + rootful bool //nolint:unused volumes []string cmd []string