Skip to content

Commit 8d8b555

Browse files
authored
Merge pull request #14 from wk8/wk8/go_1.13
Enable building with 1.13 (besides 1.12)
2 parents 5ff39c7 + 1273e89 commit 8d8b555

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ compile: compile-client compile-server compile-csi-proxy-api-gen
2222

2323
.PHONY: compile-client
2424
compile-client:
25-
$(GO_ENV_VARS) go build ./client/...
25+
cd client && $(GO_ENV_VARS) go build ./...
2626

2727
.PHONY: compile-server
2828
compile-server:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ replace (
99
// https://github.com/kubernetes/gengo/pull/155#issuecomment-537589085
1010
// is implemented, and the generic conversion generator merged into code-generator
1111
// FIXME: switch back to the upstream repo and/or code-generator!
12-
k8s.io/gengo => github.com/wk8/gengo v0.0.0-20191001015530-3d2530bfe606ffd99a90d70ef781861042e23a6f
12+
k8s.io/gengo => github.com/wk8/gengo v0.0.0-20191007012548-3d2530bfe606
1313
)
1414

1515
require (

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy
3131
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
3232
github.com/wk8/gengo v0.0.0-20191001015530-3d2530bfe606ffd99a90d70ef781861042e23a6f h1:X1xLpnAmbCIKjEbdexqRY7H8H7qQFtZ9dPUvDRXb/V0=
3333
github.com/wk8/gengo v0.0.0-20191001015530-3d2530bfe606ffd99a90d70ef781861042e23a6f/go.mod h1:7+jn4yanRF/Ylvd5qyNPUq0VhvOMDhjXrViFtHMcHxI=
34+
github.com/wk8/gengo v0.0.0-20191007012548-3d2530bfe606 h1:i5JAp+X9ISMaGt0R/9nsiFuNyYN0hXSK9KtphOk/r94=
35+
github.com/wk8/gengo v0.0.0-20191007012548-3d2530bfe606/go.mod h1:7+jn4yanRF/Ylvd5qyNPUq0VhvOMDhjXrViFtHMcHxI=
3436
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
3537
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
3638
golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=

0 commit comments

Comments
 (0)