test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Fix migrate release from github (#19510) (#19523) 

* Fix migrate release from github

* Fix bug
This commit is contained in:
Lunny Xiao 2022-04-27 20:46:00 +08:00 committed by GitHub
parent 8ff542c1a2
commit 928b603d19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
services/migrations/gitea_uploader.go
View File

@ -7,6 +7,7 @@ package migrations
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"io" "io"
"os" "os"
@ -246,7 +247,6 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
LowerTagName: strings.ToLower(release.TagName), LowerTagName: strings.ToLower(release.TagName),
Target: release.TargetCommitish, Target: release.TargetCommitish,
Title: release.Name, Title: release.Name,
Sha1: release.TargetCommitish,
Note: release.Body, Note: release.Body,
IsDraft: release.Draft, IsDraft: release.Draft,
IsPrerelease: release.Prerelease, IsPrerelease: release.Prerelease,
@ -275,15 +275,18 @@ func (g *GiteaLocalUploader) CreateReleases(releases ...*base.Release) error {
rel.OriginalAuthorID = release.PublisherID rel.OriginalAuthorID = release.PublisherID
} }
// calc NumCommits if no draft // calc NumCommits if possible
if !release.Draft { if rel.TagName != "" {
commit, err := g.gitRepo.GetTagCommit(rel.TagName) commit, err := g.gitRepo.GetTagCommit(rel.TagName)
if err != nil { if !errors.Is(err, git.ErrNotExist{}) {
return fmt.Errorf("GetTagCommit[%v]: %v", rel.TagName, err) if err != nil {
} return fmt.Errorf("GetTagCommit[%v]: %v", rel.TagName, err)
rel.NumCommits, err = commit.CommitsCount() }
if err != nil { rel.Sha1 = commit.ID.String()
return fmt.Errorf("CommitsCount: %v", err) rel.NumCommits, err = commit.CommitsCount()
if err != nil {
return fmt.Errorf("CommitsCount: %v", err)
}
} }
} }