opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-14 18:21:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16530 from elezar/bump-golang

Browse Source 
Bump golang version to 1.18
This commit is contained in:
OpenShift Merge Robot
2022-12-12 08:28:51 -05:00
committed by GitHub
parent 7153d716d3 dce7b3a5b9
commit 9ef2d9dcd9
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -286,7 +286,7 @@ build-all-new-commits:
.PHONY: vendor .PHONY: vendor
vendor: vendor:
$(GO) mod tidy -compat=1.17 $(GO) mod tidy -compat=1.18
$(GO) mod vendor $(GO) mod vendor
$(GO) mod verify $(GO) mod verify
@ -302,7 +302,7 @@ $(IN_CONTAINER): %-in-container:
$(PODMANCMD) run --rm --env HOME=/root \ $(PODMANCMD) run --rm --env HOME=/root \
-v $(CURDIR):/src -w /src \ -v $(CURDIR):/src -w /src \
--security-opt label=disable \ --security-opt label=disable \
docker.io/library/golang:1.17 \ docker.io/library/golang:1.18 \
make $(*) make $(*)

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/containers/podman/v4 module github.com/containers/podman/v4
go 1.17 go 1.18
require ( require (
github.com/BurntSushi/toml v1.2.1 github.com/BurntSushi/toml v1.2.1

2
libpod/oci_conmon_common.go
View File

@ -1438,7 +1438,7 @@ func readConmonPipeData(runtimeName string, pipe *os.File, ociLog string) (int,
ch <- syncStruct{si: si} ch <- syncStruct{si: si}
}() }()
data := -1 //nolint: wastedassign data := -1
select { select {
case ss := <-ch: case ss := <-ch:
if ss.err != nil { if ss.err != nil {

2
pkg/machine/e2e/config_init_test.go
View File

@ -27,7 +27,7 @@ type initMachine struct {
memory *uint memory *uint
now bool now bool
timezone string timezone string
rootful bool //nolint:unused,structcheck rootful bool //nolint:unused
volumes []string volumes []string
cmd []string cmd []string

2
test/tools/go.mod
View File

@ -1,6 +1,6 @@
module github.com/containers/podman/test/tools module github.com/containers/podman/test/tools
go 1.17 go 1.18
require ( require (
github.com/cpuguy83/go-md2man/v2 v2.0.2 github.com/cpuguy83/go-md2man/v2 v2.0.2