Merge pull request #16530 from elezar/bump-golang

Bump golang version to 1.18

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 $(*)
 
 

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

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 {

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

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