diff --git a/Makefile b/Makefile index 9f1587755..7e828b7d7 100644 --- a/Makefile +++ b/Makefile @@ -95,8 +95,7 @@ $(GOLANGCI_LINT): .PHONY: lint lint: $(GOLANGCI_LINT) $(GOLANGCI_LINT) run --timeout=10m ./... -# temporarily disable the linter in the example directory, see https://github.com/kcp-dev/code-generator/issues/75 -# cd examples && $(GOLANGCI_LINT) run --timeout=10m ./... + cd examples && $(GOLANGCI_LINT) run --timeout=10m ./... .PHONY: test test: diff --git a/examples/go.mod b/examples/go.mod index bfb6e6817..0dd183bb9 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -6,7 +6,7 @@ replace acme.corp/pkg => ./pkg require ( github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0 - github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455 + github.com/kcp-dev/client-go v0.0.0-20221215092857-c1e5154a9825 github.com/kcp-dev/logicalcluster/v3 v3.0.0 k8s.io/apimachinery v0.25.2 k8s.io/client-go v0.25.2 @@ -30,7 +30,6 @@ require ( github.com/google/gofuzz v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 // indirect github.com/mailru/easyjson v0.7.6 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect diff --git a/examples/go.sum b/examples/go.sum index 61c39fecf..e7fbb2fd1 100644 --- a/examples/go.sum +++ b/examples/go.sum @@ -141,10 +141,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0 h1:fb+3CdDlxvnK+o1wm3IcDbD+MJndMUa17EUGqYORsvg= github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0/go.mod h1:dn1hXHMY9E6JbyOGa0qXt1Dq4akd/jHMZOpFhJoX7q4= -github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455 h1:4tYJ1Pkjwsv9x+TKRyFizyUTJL4SfbNahPckRyIMD4A= -github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455/go.mod h1:E/pWNs9gXdW4QbDJhDl6yVWv22AHU+EhSv54EagP96I= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s= -github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g= +github.com/kcp-dev/client-go v0.0.0-20221215092857-c1e5154a9825 h1:7jgn80ujqiaAFKTZ3AE5Lx5mOwyUdDLeJzn9MhZGA3E= +github.com/kcp-dev/client-go v0.0.0-20221215092857-c1e5154a9825/go.mod h1:sj0r6sAHNsfEpA37uLTVGZj9TMQQWjBXk4rbpcIDZ7U= github.com/kcp-dev/logicalcluster/v3 v3.0.0 h1:tH6M2NuA11eLMsxii9IDOGo64X8B+P3e3pC6W2oEsx8= github.com/kcp-dev/logicalcluster/v3 v3.0.0/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= diff --git a/go.mod b/go.mod index 6265f2b51..940bb372e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/kcp-dev/code-generator/v2 go 1.18 require ( - github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.20.1 github.com/spf13/cobra v1.4.0 diff --git a/go.sum b/go.sum index 60a4bfc6f..7e86c0dde 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7 h1:ZCdSsY/oF01fxLMajM867hJJINoB6DhuVf6j4O9S37Y= -github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7/go.mod h1:QH3PS4O/Z3nyZzt5XLK8nqxwFnNEYo8ePkR8u+xj4ho= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=