xuxiaowei-com-cn
/
cicd-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 22 Wiki Activity

🐛 origin := "origin"

This commit is contained in:
徐晓伟 2023-11-23 17:49:13 +08:00
parent 1a731ba4a0
commit c607f285f6
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
api/git.go
View File

@ -2,7 +2,6 @@ package api
import (
"crypto/rand"
"fmt"
"log"
"math/big"
"net/url"
@ -49,7 +48,8 @@ func GitVersion() (string, error) {
// GitPushTag 推送标签
func GitPushTag(instance string, repository string, username, token, tag string) error {
origin := LowerCaseRandomString(6)
// origin := LowerCaseRandomString(6)
origin := "origin"
instanceUrl, err := url.Parse(instance)
if err != nil {
@ -58,15 +58,15 @@ func GitPushTag(instance string, repository string, username, token, tag string)
}
instanceUrl.User = url.UserPassword(username, token)
urlUserStr := fmt.Sprintf("%s/%s%s", instanceUrl, repository, ".git")
urlStr := fmt.Sprintf("%s/%s%s", instance, repository, ".git")
//urlUserStr := fmt.Sprintf("%s/%s%s", instanceUrl, repository, ".git")
//urlStr := fmt.Sprintf("%s/%s%s", instance, repository, ".git")
cmdAddRemote := exec.Command("git", "remote", "add", origin, urlUserStr)
_, err = cmdAddRemote.Output()
if err != nil {
log.Printf("Git 添加临时远端 %s 地址 %s 异常\n", origin, urlStr)
return err
}
//cmdAddRemote := exec.Command("git", "remote", "add", origin, urlUserStr)
//_, err = cmdAddRemote.Output()
//if err != nil {
// log.Printf("Git 添加临时远端 %s 地址 %s 异常\n", origin, urlStr)
// return err
//}
log.Printf("Git 推送远端 标签 %s 开始\n", tag)
@ -79,12 +79,12 @@ func GitPushTag(instance string, repository string, username, token, tag string)
log.Printf("Git 推送远端 标签 %s 完成\n", tag)
cmdRmRemote := exec.Command("git", "remote", "rm", origin)
_, err = cmdRmRemote.Output()
if err != nil {
log.Printf("Git 删除临时远端 %s 地址 %s 异常\n", origin, urlStr)
return err
}
//cmdRmRemote := exec.Command("git", "remote", "rm", origin)
//_, err = cmdRmRemote.Output()
//if err != nil {
// log.Printf("Git 删除临时远端 %s 地址 %s 异常\n", origin, urlStr)
// return err
//}
return nil
}