From 5a683e48bba6f8d9bf1f69584aef0284dfeb7adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=99=93=E4=BC=9F?= Date: Wed, 22 Nov 2023 20:22:10 +0800 Subject: [PATCH] =?UTF-8?q?:construction:=20=E5=8F=91=E5=B8=83=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=9A=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/git.go | 6 ++---- api/gitee.go | 6 +++++- api/github.go | 5 ++++- api/gitlab.go | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/api/git.go b/api/git.go index 61b461f..849276c 100644 --- a/api/git.go +++ b/api/git.go @@ -66,10 +66,8 @@ func GitCreateTag(tag string) error { return GitPrintTag(tag) } -func AutoCreateTag(context *cli.Context) error { - var tag = context.String(constant.Tag) - var autoCreateTag = context.Bool(constant.AutoCreateTag) - +// AutoCreateTag 自动创建标签 +func AutoCreateTag(tag string, autoCreateTag bool) error { err := GitPrintTag(tag) if err != nil { if autoCreateTag { diff --git a/api/gitee.go b/api/gitee.go index d51dc10..892a533 100644 --- a/api/gitee.go +++ b/api/gitee.go @@ -2,14 +2,18 @@ package api import ( "github.com/urfave/cli/v2" + "github.com/xuxiaowei-com-cn/cicd-release/constant" "log" ) func Gitee(prerelease bool, context *cli.Context) error { + var tag = context.String(constant.Tag) + var autoCreateTag = context.Bool(constant.AutoCreateTag) + log.Printf("是否是预发布版本:%v", prerelease) log.Printf("发布到 Gitee") - err := AutoCreateTag(context) + err := AutoCreateTag(tag, autoCreateTag) if err != nil { return err } diff --git a/api/github.go b/api/github.go index fc0bb59..d9de2df 100644 --- a/api/github.go +++ b/api/github.go @@ -6,10 +6,13 @@ import ( ) func Github(prerelease bool, context *cli.Context) error { + var tag = context.String(constant.Tag) + var autoCreateTag = context.Bool(constant.AutoCreateTag) + log.Printf("是否是预发布版本:%v", prerelease) log.Printf("发布到 GitHub") - err := AutoCreateTag(context) + err := AutoCreateTag(tag, autoCreateTag) if err != nil { return err } diff --git a/api/gitlab.go b/api/gitlab.go index d0074ca..c30c4b0 100644 --- a/api/gitlab.go +++ b/api/gitlab.go @@ -12,7 +12,7 @@ func Gitlab(prerelease bool, context *cli.Context) error { log.Printf("是否是预发布版本:%v", prerelease) log.Printf("发布到 GitLab,实例:%s", gitlabInstance) - err := AutoCreateTag(context) + err := AutoCreateTag(tag, autoCreateTag) if err != nil { return err }