Skip to content

Commit 4ea8fad

Browse files
Merge pull request #77 from p0lyn0mial/bring-back-linter
🌱 enable the linter on the generated code (example directory)
2 parents d74815f + 5f57010 commit 4ea8fad

File tree

5 files changed

+4
-11
lines changed

5 files changed

+4
-11
lines changed

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ $(GOLANGCI_LINT):
9595
.PHONY: lint
9696
lint: $(GOLANGCI_LINT)
9797
$(GOLANGCI_LINT) run --timeout=10m ./...
98-
# temporarily disable the linter in the example directory, see https://github.com/kcp-dev/code-generator/issues/75
99-
# cd examples && $(GOLANGCI_LINT) run --timeout=10m ./...
98+
cd examples && $(GOLANGCI_LINT) run --timeout=10m ./...
10099

101100
.PHONY: test
102101
test:

examples/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace acme.corp/pkg => ./pkg
66

77
require (
88
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0
9-
github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455
9+
github.com/kcp-dev/client-go v0.0.0-20221215092857-c1e5154a9825
1010
github.com/kcp-dev/logicalcluster/v3 v3.0.0
1111
k8s.io/apimachinery v0.25.2
1212
k8s.io/client-go v0.25.2
@@ -30,7 +30,6 @@ require (
3030
github.com/google/gofuzz v1.1.0 // indirect
3131
github.com/josharian/intern v1.0.0 // indirect
3232
github.com/json-iterator/go v1.1.12 // indirect
33-
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 // indirect
3433
github.com/mailru/easyjson v0.7.6 // indirect
3534
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3635
github.com/modern-go/reflect2 v1.0.2 // indirect

examples/go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
141141
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
142142
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0 h1:fb+3CdDlxvnK+o1wm3IcDbD+MJndMUa17EUGqYORsvg=
143143
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0/go.mod h1:dn1hXHMY9E6JbyOGa0qXt1Dq4akd/jHMZOpFhJoX7q4=
144-
github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455 h1:4tYJ1Pkjwsv9x+TKRyFizyUTJL4SfbNahPckRyIMD4A=
145-
github.com/kcp-dev/client-go v0.0.0-20221013125607-cac9fbfe7455/go.mod h1:E/pWNs9gXdW4QbDJhDl6yVWv22AHU+EhSv54EagP96I=
146-
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1 h1:6EMfOioekQNrpcHEK7k2ANBWogFMlf+3xTB3CC4k+2s=
147-
github.com/kcp-dev/logicalcluster/v2 v2.0.0-alpha.1/go.mod h1:lfWJL764jKFJxZWOGuFuT3PCCLPo6lV5Cl8P7u9T05g=
144+
github.com/kcp-dev/client-go v0.0.0-20221215092857-c1e5154a9825 h1:7jgn80ujqiaAFKTZ3AE5Lx5mOwyUdDLeJzn9MhZGA3E=
145+
github.com/kcp-dev/client-go v0.0.0-20221215092857-c1e5154a9825/go.mod h1:sj0r6sAHNsfEpA37uLTVGZj9TMQQWjBXk4rbpcIDZ7U=
148146
github.com/kcp-dev/logicalcluster/v3 v3.0.0 h1:tH6M2NuA11eLMsxii9IDOGo64X8B+P3e3pC6W2oEsx8=
149147
github.com/kcp-dev/logicalcluster/v3 v3.0.0/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA=
150148
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ module github.com/kcp-dev/code-generator/v2
33
go 1.18
44

55
require (
6-
github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7
76
github.com/onsi/ginkgo v1.16.5
87
github.com/onsi/gomega v1.20.1
98
github.com/spf13/cobra v1.4.0

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
6868
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
6969
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
7070
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
71-
github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7 h1:ZCdSsY/oF01fxLMajM867hJJINoB6DhuVf6j4O9S37Y=
72-
github.com/kcp-dev/code-generator v0.0.0-20221103165105-2dc1248118a7/go.mod h1:QH3PS4O/Z3nyZzt5XLK8nqxwFnNEYo8ePkR8u+xj4ho=
7371
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
7472
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
7573
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

0 commit comments

Comments
 (0)