Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
/jupiter-layoutPublic template

Commitb9bd095

Browse files
authored
Merge pull request#259 from douyu/feat/go-run
feat: use go run to generate files
2 parents847bcc1 +05a59b9 commitb9bd095

File tree

15 files changed

+713
-1321
lines changed

15 files changed

+713
-1321
lines changed

‎.github/workflows/go.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,10 @@ jobs:
4949
-name:Get dependencies
5050
run:|
5151
go env
52-
goget -v -t -d ./...
52+
gomod tidy -v
5353
5454
-name:Build
5555
run:|
56-
make init
5756
make generate
5857
5958
-name:Test

‎.github/workflows/goalngci-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
-name:Get dependencies
3333
run:|
3434
go env
35-
goget -v -t -d ./...
35+
gomod tidy -v
3636
3737
-name:golangci-lint
3838
uses:golangci/golangci-lint-action@v3.7.0

‎.github/workflows/release-latest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
-name:Get dependencies
3434
run:|
3535
go env
36-
goget -v -t -d ./...
36+
gomod tidy -v
3737
3838
-name:Build exampleserver
3939
run:|

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
.PHONY: init
33
# init tools
44
init:
5-
@echo"Installing tools from tools/tools.go"
6-
@cd tools&&cat tools.go|grep _|awk -F'"''{print $$2}'| xargs -tI % go install %
5+
@echo"Installing tools from tools.go"
6+
@cat tools.go|grep _|awk -F'"''{print $$2}'| xargs -tI % go install %
77

88
.PHONY: generate
99
# generate code
@@ -18,7 +18,7 @@ build:
1818
.PHONY: run
1919
# run
2020
run:
21-
jupiter run-c cmd/exampleserver/.jupiter.toml
21+
go run github.com/douyu/jupiter/cmd/jupiter run-c cmd/exampleserver/.jupiter.toml
2222

2323
.PHONY: lint
2424
# lint
@@ -34,7 +34,7 @@ test:
3434
# e2e-test
3535
e2e-test:
3636
cd tests/e2e\
37-
&& ginkgo -r -race -cover -covermode=atomic -coverprofile=coverage.txt --randomize-suites --trace -coverpkg=github.com/douyu/jupiter-layout/... .\
37+
&&go run github.com/onsi/ginkgo/v2/ginkgo -r -race -cover -covermode=atomic -coverprofile=coverage.txt --randomize-suites --trace -coverpkg=github.com/douyu/jupiter-layout/... .\
3838
&&cd -
3939

4040
.PHONY: covsh-e2e

‎generate.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ package main
66
// mock代码生成：https://github.com/vektra/mockery
77

88
//go:generate bash -c "find . -type f -path '*.go'|grep -v vendor/|egrep -e 'interface_|mock_'|xargs -r rm"
9-
//go:generate jupiter struct2interface -d internal/pkg
10-
//go:generate mockery --all --inpackage --dir internal/pkg
11-
//go:generate wire ./...
9+
//go:generatego run github.com/douyu/jupiter/cmd/jupiter struct2interface -d internal/pkg
10+
//go:generatego run github.com/vektra/mockery/v2 --all --inpackage --dir internal/pkg
11+
//go:generatego run github.com/google/wire/cmd/wire ./...

‎go.mod‎

Lines changed: 109 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,83 +7,174 @@ require (
77
github.com/apache/rocketmq-client-go/v2v2.1.2-0.20230628073434-533de03048e1
88
github.com/douyu/jupiterv0.11.12
99
github.com/douyu/protov0.0.0-20230411032241-946416ae9d3e
10+
github.com/envoyproxy/protoc-gen-validatev0.10.1
11+
github.com/go-swagger/go-swaggerv0.30.5
1012
github.com/google/wirev0.5.0
13+
github.com/grpc-ecosystem/grpc-gateway/v2v2.16.2
1114
github.com/imdario/mergov0.3.16
1215
github.com/onsi/ginkgo/v2v2.11.0
1316
github.com/onsi/gomegav1.27.10
1417
github.com/samber/lov1.38.1
18+
github.com/srikrsna/protoc-gen-gotagv0.6.2
1519
github.com/stretchr/testifyv1.8.4
20+
github.com/vektra/mockery/v2v2.33.0
1621
go.uber.org/zapv1.25.0
1722
google.golang.org/grpcv1.57.0
23+
google.golang.org/grpc/cmd/protoc-gen-go-grpcv1.3.0
1824
google.golang.org/protobufv1.31.0
25+
gorm.io/genv0.3.23
1926
gorm.io/gormv1.25.4
2027
)
2128

2229
require (
30+
github.com/ClickHouse/ch-gov0.48.0// indirect
31+
github.com/ClickHouse/clickhouse-go/v2v2.3.0// indirect
32+
github.com/Masterminds/goutilsv1.1.1// indirect
33+
github.com/Masterminds/semver/v3v3.2.0// indirect
34+
github.com/Masterminds/sprig/v3v3.2.3// indirect
2335
github.com/StackExchange/wmiv1.2.1// indirect
2436
github.com/alibaba/sentinel-golangv1.0.4// indirect
37+
github.com/andybalholm/brotliv1.0.5// indirect
38+
github.com/asaskevich/govalidatorv0.0.0-20230301143203-a9d515a09cc2// indirect
2539
github.com/beorn7/perksv1.0.1// indirect
40+
github.com/bep/godartsassv0.16.0// indirect
41+
github.com/bep/golibsassv1.1.0// indirect
2642
github.com/cenkalti/backoff/v4v4.2.1// indirect
2743
github.com/cespare/xxhash/v2v2.2.0// indirect
44+
github.com/chigopher/pathlibv0.15.0// indirect
45+
github.com/cli/safeexecv1.0.0// indirect
2846
github.com/codegangsta/injectv0.0.0-20150114235600-33e0aa1cb7c0// indirect
47+
github.com/common-nighthawk/go-figurev0.0.0-20200609044655-c4b36f998cf2// indirect
2948
github.com/coreos/go-semverv0.3.0// indirect
3049
github.com/coreos/go-systemd/v22v22.3.3-0.20220203105225-a9a7ef127534// indirect
50+
github.com/cosmtrek/airv1.43.0// indirect
51+
github.com/cpuguy83/go-md2man/v2v2.0.2// indirect
52+
github.com/creack/ptyv1.1.18// indirect
3153
github.com/davecgh/go-spewv1.1.1// indirect
3254
github.com/dgryski/go-rendezvousv0.0.0-20200823014737-9f7001d12a5f// indirect
55+
github.com/dimiro1/bannerv1.1.0// indirect
3356
github.com/emirpasic/godsv1.12.0// indirect
34-
github.com/envoyproxy/protoc-gen-validatev0.10.1// indirect
3557
github.com/fatih/colorv1.15.0// indirect
58+
github.com/fatih/structtagv1.2.0// indirect
59+
github.com/felixge/httpsnoopv1.0.3// indirect
3660
github.com/fsnotify/fsnotifyv1.6.0// indirect
61+
github.com/go-faster/cityv1.0.1// indirect
62+
github.com/go-faster/errorsv0.6.1// indirect
3763
github.com/go-logr/logrv1.2.4// indirect
3864
github.com/go-logr/stdrv1.2.2// indirect
39-
github.com/go-ole/go-olev1.2.5// indirect
65+
github.com/go-ole/go-olev1.2.6// indirect
66+
github.com/go-openapi/analysisv0.21.4// indirect
67+
github.com/go-openapi/errorsv0.20.4// indirect
68+
github.com/go-openapi/inflectv0.19.0// indirect
69+
github.com/go-openapi/jsonpointerv0.19.6// indirect
70+
github.com/go-openapi/jsonreferencev0.20.2// indirect
71+
github.com/go-openapi/loadsv0.21.2// indirect
72+
github.com/go-openapi/runtimev0.26.0// indirect
73+
github.com/go-openapi/specv0.20.9// indirect
74+
github.com/go-openapi/strfmtv0.21.7// indirect
75+
github.com/go-openapi/swagv0.22.4// indirect
76+
github.com/go-openapi/validatev0.22.1// indirect
4077
github.com/go-redis/redis/v8v8.11.5// indirect
4178
github.com/go-resty/resty/v2v2.7.0// indirect
4279
github.com/go-sql-driver/mysqlv1.7.0// indirect
4380
github.com/go-task/slim-sprigv0.0.0-20230315185526-52ccab3ef572// indirect
4481
github.com/gogo/protobufv1.3.2// indirect
82+
github.com/gohugoio/hugov0.111.3// indirect
83+
github.com/golang-sql/civilv0.0.0-20220223132316-b832511892a9// indirect
84+
github.com/golang-sql/sqlexpv0.1.0// indirect
85+
github.com/golang/glogv1.1.0// indirect
4586
github.com/golang/mockv1.6.0// indirect
4687
github.com/golang/protobufv1.5.3// indirect
4788
github.com/google/go-cmpv0.5.9// indirect
4889
github.com/google/pprofv0.0.0-20210407192527-94a9f03dee38// indirect
90+
github.com/google/subcommandsv1.0.1// indirect
4991
github.com/google/uuidv1.3.0// indirect
92+
github.com/gorilla/handlersv1.5.1// indirect
5093
github.com/grpc-ecosystem/go-grpc-prometheusv1.2.0// indirect
51-
github.com/grpc-ecosystem/grpc-gateway/v2v2.16.2// indirect
94+
github.com/hashicorp/go-versionv1.6.0// indirect
95+
github.com/hashicorp/hclv1.0.0// indirect
96+
github.com/hnlq715/struct2interfacev0.1.5// indirect
97+
github.com/huandu/xstringsv1.3.3// indirect
98+
github.com/iancoleman/strcasev0.3.0// indirect
99+
github.com/inconshreveable/mousetrapv1.1.0// indirect
100+
github.com/jackc/chunkreader/v2v2.0.1// indirect
101+
github.com/jackc/pgconnv1.13.0// indirect
102+
github.com/jackc/pgiov1.0.0// indirect
103+
github.com/jackc/pgpassfilev1.0.0// indirect
104+
github.com/jackc/pgproto3/v2v2.3.1// indirect
105+
github.com/jackc/pgservicefilev0.0.0-20200714003250-2b9c44734f2b// indirect
106+
github.com/jackc/pgtypev1.12.0// indirect
107+
github.com/jackc/pgx/v4v4.17.2// indirect
108+
github.com/jessevdk/go-flagsv1.5.0// indirect
109+
github.com/jinzhu/copierv0.3.5// indirect
52110
github.com/jinzhu/inflectionv1.0.0// indirect
53111
github.com/jinzhu/nowv1.1.5// indirect
112+
github.com/josharian/internv1.0.0// indirect
54113
github.com/json-iterator/gov1.1.12// indirect
55114
github.com/juju/ratelimitv1.0.2// indirect
115+
github.com/klauspost/compressv1.16.3// indirect
116+
github.com/kr/prettyv0.3.1// indirect
117+
github.com/kr/textv0.2.0// indirect
56118
github.com/labstack/echo/v4v4.11.1// indirect
57119
github.com/labstack/gommonv0.4.0// indirect
120+
github.com/lyft/protoc-gen-starv0.5.3// indirect
121+
github.com/lyft/protoc-gen-star/v2v2.0.1// indirect
122+
github.com/magiconair/propertiesv1.8.7// indirect
123+
github.com/mailru/easyjsonv0.7.7// indirect
58124
github.com/mattn/go-colorablev0.1.13// indirect
59125
github.com/mattn/go-isattyv0.0.19// indirect
126+
github.com/mattn/go-sqlite3v1.14.15// indirect
60127
github.com/matttproud/golang_protobuf_extensionsv1.0.4// indirect
128+
github.com/microsoft/go-mssqldbv0.17.0// indirect
129+
github.com/mitchellh/copystructurev1.2.0// indirect
130+
github.com/mitchellh/go-homedirv1.1.0// indirect
61131
github.com/mitchellh/mapstructurev1.5.0// indirect
132+
github.com/mitchellh/reflectwalkv1.0.2// indirect
62133
github.com/modern-go/concurrentv0.0.0-20180306012644-bacd9c7ef1dd// indirect
63134
github.com/modern-go/reflect2v1.0.2// indirect
135+
github.com/oklog/ulidv1.3.1// indirect
64136
github.com/opentracing/opentracing-gov1.2.0// indirect
65137
github.com/patrickmn/go-cachev2.1.0+incompatible// indirect
138+
github.com/paulmach/orbv0.7.1// indirect
139+
github.com/pelletier/go-tomlv1.9.5// indirect
140+
github.com/pelletier/go-toml/v2v2.0.8// indirect
141+
github.com/pierrec/lz4/v4v4.1.17// indirect
66142
github.com/pkg/errorsv0.9.1// indirect
67143
github.com/pmezard/go-difflibv1.0.0// indirect
68144
github.com/prometheus/client_golangv1.16.0// indirect
69145
github.com/prometheus/client_modelv0.3.0// indirect
70146
github.com/prometheus/commonv0.42.0// indirect
71147
github.com/prometheus/procfsv0.10.1// indirect
148+
github.com/rogpeppe/go-internalv1.9.0// indirect
149+
github.com/rs/zerologv1.29.0// indirect
150+
github.com/russross/blackfriday/v2v2.1.0// indirect
151+
github.com/segmentio/asmv1.2.0// indirect
72152
github.com/shirou/gopsutil/v3v3.21.7// indirect
153+
github.com/shopspring/decimalv1.3.1// indirect
73154
github.com/sirupsen/logrusv1.9.0// indirect
155+
github.com/spf13/aferov1.9.5// indirect
74156
github.com/spf13/castv1.5.1// indirect
75-
github.com/srikrsna/protoc-gen-gotagv0.6.2// indirect
157+
github.com/spf13/cobrav1.7.0// indirect
158+
github.com/spf13/jwalterweathermanv1.1.0// indirect
159+
github.com/spf13/pflagv1.0.5// indirect
160+
github.com/spf13/viperv1.16.0// indirect
76161
github.com/stretchr/objxv0.5.0// indirect
162+
github.com/subosito/gotenvv1.4.2// indirect
163+
github.com/tdewolff/parse/v2v2.6.5// indirect
77164
github.com/tidwall/gjsonv1.13.0// indirect
78165
github.com/tidwall/matchv1.1.1// indirect
79166
github.com/tidwall/prettyv1.2.1// indirect
80-
github.com/tklauser/go-sysconfv0.3.7// indirect
81-
github.com/tklauser/numcpusv0.2.3// indirect
167+
github.com/tklauser/go-sysconfv0.3.10// indirect
168+
github.com/tklauser/numcpusv0.4.0// indirect
169+
github.com/toqueteos/webbrowserv1.2.0// indirect
170+
github.com/urfave/cliv1.22.14// indirect
82171
github.com/valyala/bytebufferpoolv1.0.0// indirect
83172
github.com/valyala/fasttemplatev1.2.2// indirect
173+
github.com/xlab/treeprintv1.2.0// indirect
84174
go.etcd.io/etcd/api/v3v3.5.9// indirect
85175
go.etcd.io/etcd/client/pkg/v3v3.5.9// indirect
86176
go.etcd.io/etcd/client/v3v3.5.9// indirect
177+
go.mongodb.org/mongo-driverv1.11.6// indirect
87178
go.opentelemetry.io/otelv1.16.0// indirect
88179
go.opentelemetry.io/otel/bridge/opentracingv1.16.0// indirect
89180
go.opentelemetry.io/otel/exporters/jaegerv1.16.0// indirect
@@ -99,17 +190,28 @@ require (
99190
go.uber.org/multierrv1.11.0// indirect
100191
golang.org/x/cryptov0.11.0// indirect
101192
golang.org/x/expv0.0.0-20230131160201-f062dba9d201// indirect
193+
golang.org/x/lintv0.0.0-20210508222113-6edffad5e616// indirect
194+
golang.org/x/modv0.12.0// indirect
102195
golang.org/x/netv0.12.0// indirect
103196
golang.org/x/syncv0.3.0// indirect
104197
golang.org/x/sysv0.10.0// indirect
198+
golang.org/x/termv0.10.0// indirect
105199
golang.org/x/textv0.12.0// indirect
106200
golang.org/x/toolsv0.9.3// indirect
107201
google.golang.org/genprotov0.0.0-20230706204954-ccb25ca9f130// indirect
108202
google.golang.org/genproto/googleapis/apiv0.0.0-20230726155614-23370e0ffb3e// indirect
109203
google.golang.org/genproto/googleapis/rpcv0.0.0-20230726155614-23370e0ffb3e// indirect
204+
gopkg.in/ini.v1v1.67.0// indirect
110205
gopkg.in/natefinch/lumberjack.v2v2.0.0// indirect
111206
gopkg.in/yaml.v2v2.4.0// indirect
112207
gopkg.in/yaml.v3v3.0.1// indirect
113-
gorm.io/driver/mysqlv1.5.0// indirect
208+
gorm.io/datatypesv1.1.1-0.20230130040222-c43177d3cf8c// indirect
209+
gorm.io/driver/clickhousev0.5.0// indirect
210+
gorm.io/driver/mysqlv1.5.1-0.20230509030346-3715c134c25b// indirect
211+
gorm.io/driver/postgresv1.4.5// indirect
212+
gorm.io/driver/sqlitev1.4.3// indirect
213+
gorm.io/driver/sqlserverv1.4.1// indirect
214+
gorm.io/hintsv1.1.0// indirect
215+
gorm.io/plugin/dbresolverv1.3.0// indirect
114216
stathat.com/c/consistentv1.0.0// indirect
115217
)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp