Skip to content

Commit 9d9eab6

Browse files
committed
fix: barry quick fix, 2025-06-25 10:40:20
1 parent a57b6e5 commit 9d9eab6

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

.goreleaser.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ builds:
99
- windows
1010
goarch:
1111
- amd64
12+
- arm64
1213
ldflags:
1314
- -X 'github.com/pubgo/protobuild/version.Version={{ .Version }}'
1415
- main: ./cmd/protoc-gen-retag/main.go
@@ -21,6 +22,7 @@ builds:
2122
- windows
2223
goarch:
2324
- amd64
25+
- arm64
2426
archives:
2527
- name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
2628
format: binary

cmd/protobuild/cmd.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func Main() *cli.Command {
6565
Usage: "protobuf config path",
6666
Value: protoCfg,
6767
Hidden: false,
68-
Persistent: true,
68+
Local: true,
6969
Destination: &protoCfg,
7070
},
7171
},
@@ -135,9 +135,11 @@ func Main() *cli.Command {
135135
},
136136
Commands: typex.Commands{
137137
&cli.Command{
138-
Name: "gen",
139-
Usage: "编译 protobuf 文件",
140-
Before: func(ctx context.Context, c *cli.Command) error { return parseConfig() },
138+
Name: "gen",
139+
Usage: "编译 protobuf 文件",
140+
Before: func(ctx context.Context, command *cli.Command) (context.Context, error) {
141+
return ctx, parseConfig()
142+
},
141143
Action: func(ctx context.Context, c *cli.Command) error {
142144
defer recovery.Exit()
143145

@@ -313,8 +315,8 @@ func Main() *cli.Command {
313315
&cli.Command{
314316
Name: "vendor",
315317
Usage: "同步项目 protobuf 依赖到 .proto 目录中",
316-
Before: func(ctx context.Context, c *cli.Command) error {
317-
return parseConfig()
318+
Before: func(ctx context.Context, command *cli.Command) (context.Context, error) {
319+
return ctx, parseConfig()
318320
},
319321
Flags: typex.Flags{
320322
&cli.BoolFlag{
@@ -480,8 +482,8 @@ func Main() *cli.Command {
480482
&cli.Command{
481483
Name: "install",
482484
Usage: "install protobuf plugin",
483-
Before: func(ctx context.Context, c *cli.Command) error {
484-
return parseConfig()
485+
Before: func(ctx context.Context, command *cli.Command) (context.Context, error) {
486+
return ctx, parseConfig()
485487
},
486488
Flags: typex.Flags{
487489
&cli.BoolFlag{

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/pubgo/protobuild
33
go 1.24
44

55
require (
6-
github.com/a8m/envsubst v1.3.0
6+
github.com/a8m/envsubst v1.4.3
77
github.com/bufbuild/protocompile v0.14.1
8-
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08
8+
github.com/cnf/structhash v0.0.0-20250313080605-df4c6cc74a9a
99
github.com/dave/jennifer v1.6.0
1010
github.com/deckarep/golang-set/v2 v2.6.0
1111
github.com/emicklei/proto v1.11.0
@@ -24,7 +24,7 @@ require (
2424
github.com/searKing/golang/go v1.2.115
2525
github.com/spf13/cast v1.5.0
2626
github.com/spf13/pflag v1.0.6
27-
github.com/urfave/cli/v3 v3.0.0-alpha9.0.20240717192922-127cf54fac9f
27+
github.com/urfave/cli/v3 v3.3.8
2828
github.com/yuin/goldmark v1.4.12
2929
go.uber.org/multierr v1.11.0
3030
golang.org/x/mod v0.17.0

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f
4242
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
4343
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4444
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
45-
github.com/a8m/envsubst v1.3.0 h1:GmXKmVssap0YtlU3E230W98RWtWCyIZzjtf1apWWyAg=
46-
github.com/a8m/envsubst v1.3.0/go.mod h1:MVUTQNGQ3tsjOOtKCNd+fl8RzhsXcDvvAEzkhGtlsbY=
45+
github.com/a8m/envsubst v1.4.3 h1:kDF7paGK8QACWYaQo6KtyYBozY2jhQrTuNNuUxQkhJY=
46+
github.com/a8m/envsubst v1.4.3/go.mod h1:4jjHWQlZoaXPoLQUb7H2qT4iLkZDdmEQiOUogdUmqVU=
4747
github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
4848
github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
4949
github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
@@ -58,8 +58,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
5858
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
5959
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
6060
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
61-
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 h1:ox2F0PSMlrAAiAdknSRMDrAr8mfxPCfSZolH+/qQnyQ=
62-
github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08/go.mod h1:pCxVEbcm3AMg7ejXyorUXi6HQCzOIBf7zEDVPtw0/U4=
61+
github.com/cnf/structhash v0.0.0-20250313080605-df4c6cc74a9a h1:Ohw57yVY2dBTt+gsC6aZdteyxwlxfbtgkFEMTEkwgSw=
62+
github.com/cnf/structhash v0.0.0-20250313080605-df4c6cc74a9a/go.mod h1:pCxVEbcm3AMg7ejXyorUXi6HQCzOIBf7zEDVPtw0/U4=
6363
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
6464
github.com/dave/jennifer v1.6.0 h1:MQ/6emI2xM7wt0tJzJzyUik2Q3Tcn2eE0vtYgh4GPVI=
6565
github.com/dave/jennifer v1.6.0/go.mod h1:AxTG893FiZKqxy3FP1kL80VMshSMuz2G+EgvszgGRnk=
@@ -238,16 +238,16 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
238238
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
239239
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
240240
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
241-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
242-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
241+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
242+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
243243
github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
244244
github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
245245
github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
246246
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
247247
github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
248248
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
249-
github.com/urfave/cli/v3 v3.0.0-alpha9.0.20240717192922-127cf54fac9f h1:yCJ90PBe7+45EQSF3qJXyAGW5rkE65lE8huv5pM0HY8=
250-
github.com/urfave/cli/v3 v3.0.0-alpha9.0.20240717192922-127cf54fac9f/go.mod h1:Z1ItyMma7t6I7zHG9OpbExhHQOSkFf/96n+mAZ9MtVI=
249+
github.com/urfave/cli/v3 v3.3.8 h1:BzolUExliMdet9NlJ/u4m5vHSotJ3PzEqSAZ1oPMa/E=
250+
github.com/urfave/cli/v3 v3.3.8/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
251251
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
252252
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
253253
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=

0 commit comments

Comments
 (0)