Skip to content

Commit d858f93

Browse files
authored
Merge pull request #6650 from JohnTitor/update-go
Update Go version to 1.18
2 parents fe1f9d5 + cdbf1b8 commit d858f93

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
IMAGE_NAME=golang:1.12
2-
export GO111MODULE=on
1+
IMAGE_NAME=golang:1.18
32
export GOPROXY?=https://proxy.golang.org
43

54
default: \
@@ -12,7 +11,7 @@ generate:
1211
go run ./generator/app.go
1312

1413
generate-dockerized:
15-
docker run --rm -e WHAT -e GO111MODULE -e GOPROXY -v $(shell pwd):/go/src/app:Z $(IMAGE_NAME) make -C /go/src/app generate
14+
docker run --rm -e WHAT -e GOPROXY -v $(shell pwd):/go/src/app:Z $(IMAGE_NAME) make -C /go/src/app generate
1615

1716
verify:
1817
@hack/verify.sh

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module k8s.io/community
22

3-
go 1.15
3+
go 1.18
44

55
require (
66
github.com/client9/misspell v0.3.4

0 commit comments

Comments
 (0)