Skip to content

Commit 26b9841

Browse files
authored
[Vendor] update gitea-sdk v0.14.0 (#15103) (#15107)
* upgraded code.gitea.io/sdk/gitea v0.13.2 => v0.14.0 * rm workaround
1 parent 8b0cf88 commit 26b9841

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1333
-355
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.14
55
require (
66
cloud.google.com/go v0.78.0 // indirect
77
code.gitea.io/gitea-vet v0.2.1
8-
code.gitea.io/sdk/gitea v0.13.2
8+
code.gitea.io/sdk/gitea v0.14.0
99
gitea.com/go-chi/binding v0.0.0-20210301195521-1fe1c9a555e7
1010
gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e
1111
gitea.com/go-chi/captcha v0.0.0-20210110083842-e7696c336a1e

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
3838
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
3939
code.gitea.io/gitea-vet v0.2.1 h1:b30by7+3SkmiftK0RjuXqFvZg2q4p68uoPGuxhzBN0s=
4040
code.gitea.io/gitea-vet v0.2.1/go.mod h1:zcNbT/aJEmivCAhfmkHOlT645KNOf9W2KnkLgFjGGfE=
41-
code.gitea.io/sdk/gitea v0.13.2 h1:wAnT/J7Z62q3fJXbgnecoaOBh8CM1Qq0/DakWxiv4yA=
42-
code.gitea.io/sdk/gitea v0.13.2/go.mod h1:lee2y8LeV3kQb2iK+hHlMqoadL4bp27QOkOV/hawLKg=
41+
code.gitea.io/sdk/gitea v0.14.0 h1:m4J352I3p9+bmJUfS+g0odeQzBY/5OXP91Gv6D4fnJ0=
42+
code.gitea.io/sdk/gitea v0.14.0/go.mod h1:89WiyOX1KEcvjP66sRHdu0RafojGo60bT9UqW17VbWs=
4343
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
4444
gitea.com/go-chi/binding v0.0.0-20210301195521-1fe1c9a555e7 h1:xCVJPY823C8RWpgMabTw2kOglDrg0iS3GcQU6wdwHkU=
4545
gitea.com/go-chi/binding v0.0.0-20210301195521-1fe1c9a555e7/go.mod h1:AyfTrwtfYN54R/HmVvMYPnSTenH5bVoyh8x6tBluxEA=

modules/migrations/gitea_downloader.go

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,6 @@ func (g *GiteaDownloader) GetPullRequests(page, perPage int) ([]*base.PullReques
525525
headRepoName = pr.Head.Repository.Name
526526
headCloneURL = pr.Head.Repository.CloneURL
527527
}
528-
if err := fixPullHeadSha(g.client, pr); err != nil {
529-
return nil, false, fmt.Errorf("error while resolving head git ref: %s for pull #%d. Error: %v", pr.Head.Ref, pr.Index, err)
530-
}
531528
headSHA = pr.Head.Sha
532529
headRef = pr.Head.Ref
533530
}
@@ -679,22 +676,3 @@ func (g *GiteaDownloader) GetReviews(index int64) ([]*base.Review, error) {
679676
}
680677
return allReviews, nil
681678
}
682-
683-
// fixPullHeadSha is a workaround for https://github.com/go-gitea/gitea/issues/12675
684-
// When no head sha is available, this is because the branch got deleted in the base repo.
685-
// pr.Head.Ref points in this case not to the head repo branch name, but the base repo ref,
686-
// which stays available to resolve the commit sha.
687-
func fixPullHeadSha(client *gitea_sdk.Client, pr *gitea_sdk.PullRequest) error {
688-
owner := pr.Base.Repository.Owner.UserName
689-
repo := pr.Base.Repository.Name
690-
if pr.Head != nil && pr.Head.Sha == "" {
691-
refs, _, err := client.GetRepoRefs(owner, repo, pr.Head.Ref)
692-
if err != nil {
693-
return err
694-
} else if len(refs) == 0 {
695-
return fmt.Errorf("unable to resolve PR ref '%s'", pr.Head.Ref)
696-
}
697-
pr.Head.Sha = refs[0].Object.SHA
698-
}
699-
return nil
700-
}

vendor/code.gitea.io/sdk/gitea/admin_cron.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/sdk/gitea/admin_org.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/sdk/gitea/admin_repo.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/sdk/gitea/admin_user.go

Lines changed: 27 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/code.gitea.io/sdk/gitea/attachment.go

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)