From a3d7c9bf6bbe48cecab3e9c29cd014b1a577564f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Mon, 6 Feb 2023 15:28:23 +0800 Subject: [PATCH 1/4] fix: remove unused code and use jupiter version --- cmd/protoc-gen-go-xerror/xerror.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/protoc-gen-go-xerror/xerror.go b/cmd/protoc-gen-go-xerror/xerror.go index 88845059ef..fac022235e 100644 --- a/cmd/protoc-gen-go-xerror/xerror.go +++ b/cmd/protoc-gen-go-xerror/xerror.go @@ -3,20 +3,19 @@ package main import ( "fmt" + "github.com/douyu/jupiter/pkg" errorv1 "github.com/douyu/jupiter/proto/error/v1" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/proto" ) -const ( - version = "v0.0.1" +var version = pkg.JupiterVersion() +const ( xerrorPkg = protogen.GoImportPath("github.com/douyu/jupiter/pkg/util/xerror") deprecationComment = "// Deprecated: Do not use." ) -var methodSets = make(map[string]int) - // generateFile generates a _error.pb.go file. func generateFile(gen *protogen.Plugin, file *protogen.File) *protogen.GeneratedFile { if len(file.Services) == 0 { From 0f1cd1e6e2be0fb1f62be590ba1d094f91663c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Mon, 6 Feb 2023 15:36:35 +0800 Subject: [PATCH 2/4] add version --- cmd/protoc-gen-go-xerror/main.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cmd/protoc-gen-go-xerror/main.go b/cmd/protoc-gen-go-xerror/main.go index 8f9cb9927f..718319ff57 100644 --- a/cmd/protoc-gen-go-xerror/main.go +++ b/cmd/protoc-gen-go-xerror/main.go @@ -2,15 +2,24 @@ package main import ( "flag" + "fmt" + "github.com/douyu/jupiter/pkg" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/types/pluginpb" ) +var showVersion = flag.Bool("version", false, "print the version and exit") + func main() { + flag.Parse() - var flags flag.FlagSet + if *showVersion { + fmt.Printf("protoc-gen-go-errors %v\n", pkg.JupiterVersion()) + return + } + var flags flag.FlagSet options := protogen.Options{ ParamFunc: flags.Set, } From 48927e2b75aa9fcf402a806ee1a5d4875f27e521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Mon, 6 Feb 2023 15:36:44 +0800 Subject: [PATCH 3/4] fix --- cmd/protoc-gen-go-xerror/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/protoc-gen-go-xerror/main.go b/cmd/protoc-gen-go-xerror/main.go index 718319ff57..becc5e1765 100644 --- a/cmd/protoc-gen-go-xerror/main.go +++ b/cmd/protoc-gen-go-xerror/main.go @@ -15,7 +15,7 @@ func main() { flag.Parse() if *showVersion { - fmt.Printf("protoc-gen-go-errors %v\n", pkg.JupiterVersion()) + fmt.Printf("protoc-gen-go-xerror %v\n", pkg.JupiterVersion()) return } From 967b5a6d725c06da1b72aca35865c211ebd38ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=8F=AF?= Date: Mon, 6 Feb 2023 15:41:23 +0800 Subject: [PATCH 4/4] add version for jupiter --- cmd/jupiter/main.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/jupiter/main.go b/cmd/jupiter/main.go index 4c07567f3a..8562f1078a 100644 --- a/cmd/jupiter/main.go +++ b/cmd/jupiter/main.go @@ -15,10 +15,12 @@ package main import ( + "fmt" "log" "os" "sort" + "github.com/douyu/jupiter/pkg" "github.com/douyu/jupiter/pkg/core/cmd" "github.com/urfave/cli" ) @@ -111,6 +113,15 @@ var Commands = []cli.Command{ }, }, }, + { + Name: "version", + Aliases: []string{"v"}, + Usage: "show version", + Action: func(c *cli.Context) error { + fmt.Printf("jupiter %v\n", pkg.JupiterVersion()) + return nil + }, + }, } func main() {