diff options
author | harryzcy <harry@harryzheng.com> | 2023-04-08 07:27:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-08 19:27:30 +0800 |
commit | 1ee45305e051e7df23ee401382a929376f2fb323 (patch) | |
tree | 1272ef8a5449e51189295528ec89f83d467ea90f /services/migrations | |
parent | 5e1bd8af5f16f9db88cfeb5b80bdf731435cacfb (diff) | |
download | gitea-1ee45305e051e7df23ee401382a929376f2fb323.tar.gz gitea-1ee45305e051e7df23ee401382a929376f2fb323.zip |
Update github.com/google/go-github to v51 (#23946)
`github.com/google/go-github` has new major version releases frequently.
It is required to update all import path, in additional to `go.mod`
Diffstat (limited to 'services/migrations')
-rw-r--r-- | services/migrations/error.go | 2 | ||||
-rw-r--r-- | services/migrations/github.go | 45 |
2 files changed, 27 insertions, 20 deletions
diff --git a/services/migrations/error.go b/services/migrations/error.go index 46d303ac8e..5f0388a497 100644 --- a/services/migrations/error.go +++ b/services/migrations/error.go @@ -7,7 +7,7 @@ package migrations import ( "errors" - "github.com/google/go-github/v45/github" + "github.com/google/go-github/v51/github" ) // ErrRepoNotCreated returns the error that repository not created diff --git a/services/migrations/github.go b/services/migrations/github.go index d34ad13b95..26e8813536 100644 --- a/services/migrations/github.go +++ b/services/migrations/github.go @@ -21,7 +21,7 @@ import ( "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" - "github.com/google/go-github/v45/github" + "github.com/google/go-github/v51/github" "golang.org/x/oauth2" ) @@ -259,11 +259,11 @@ func (g *GithubDownloaderV3) GetMilestones() ([]*base.Milestone, error) { milestones = append(milestones, &base.Milestone{ Title: m.GetTitle(), Description: m.GetDescription(), - Deadline: m.DueOn, + Deadline: convertGithubTimestampToTime(m.DueOn), State: state, - Created: m.GetCreatedAt(), - Updated: m.UpdatedAt, - Closed: m.ClosedAt, + Created: m.GetCreatedAt().Time, + Updated: convertGithubTimestampToTime(m.UpdatedAt), + Closed: convertGithubTimestampToTime(m.ClosedAt), }) } if len(ms) < perPage { @@ -486,11 +486,11 @@ func (g *GithubDownloaderV3) GetIssues(page, perPage int) ([]*base.Issue, bool, Content: issue.GetBody(), Milestone: issue.GetMilestone().GetTitle(), State: issue.GetState(), - Created: issue.GetCreatedAt(), - Updated: issue.GetUpdatedAt(), + Created: issue.GetCreatedAt().Time, + Updated: issue.GetUpdatedAt().Time, Labels: labels, Reactions: reactions, - Closed: issue.ClosedAt, + Closed: &issue.ClosedAt.Time, IsLocked: issue.GetLocked(), Assignees: assignees, ForeignIndex: int64(*issue.Number), @@ -565,8 +565,8 @@ func (g *GithubDownloaderV3) getComments(commentable base.Commentable) ([]*base. PosterName: comment.GetUser().GetLogin(), PosterEmail: comment.GetUser().GetEmail(), Content: comment.GetBody(), - Created: comment.GetCreatedAt(), - Updated: comment.GetUpdatedAt(), + Created: comment.GetCreatedAt().Time, + Updated: comment.GetUpdatedAt().Time, Reactions: reactions, }) } @@ -641,8 +641,8 @@ func (g *GithubDownloaderV3) GetAllComments(page, perPage int) ([]*base.Comment, PosterName: comment.GetUser().GetLogin(), PosterEmail: comment.GetUser().GetEmail(), Content: comment.GetBody(), - Created: comment.GetCreatedAt(), - Updated: comment.GetUpdatedAt(), + Created: comment.GetCreatedAt().Time, + Updated: comment.GetUpdatedAt().Time, Reactions: reactions, }) } @@ -716,13 +716,13 @@ func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullReq Content: pr.GetBody(), Milestone: pr.GetMilestone().GetTitle(), State: pr.GetState(), - Created: pr.GetCreatedAt(), - Updated: pr.GetUpdatedAt(), - Closed: pr.ClosedAt, + Created: pr.GetCreatedAt().Time, + Updated: pr.GetUpdatedAt().Time, + Closed: convertGithubTimestampToTime(pr.ClosedAt), Labels: labels, Merged: pr.MergedAt != nil, MergeCommitSHA: pr.GetMergeCommitSHA(), - MergedTime: pr.MergedAt, + MergedTime: convertGithubTimestampToTime(pr.MergedAt), IsLocked: pr.ActiveLockReason != nil, Head: base.PullRequestBranch{ Ref: pr.GetHead().GetRef(), @@ -756,7 +756,7 @@ func convertGithubReview(r *github.PullRequestReview) *base.Review { ReviewerName: r.GetUser().GetLogin(), CommitID: r.GetCommitID(), Content: r.GetBody(), - CreatedAt: r.GetSubmittedAt(), + CreatedAt: r.GetSubmittedAt().Time, State: r.GetState(), } } @@ -800,8 +800,8 @@ func (g *GithubDownloaderV3) convertGithubReviewComments(cs []*github.PullReques CommitID: c.GetCommitID(), PosterID: c.GetUser().GetID(), Reactions: reactions, - CreatedAt: c.GetCreatedAt(), - UpdatedAt: c.GetUpdatedAt(), + CreatedAt: c.GetCreatedAt().Time, + UpdatedAt: c.GetUpdatedAt().Time, }) } return rcs, nil @@ -881,3 +881,10 @@ func (g *GithubDownloaderV3) GetReviews(reviewable base.Reviewable) ([]*base.Rev } return allReviews, nil } + +func convertGithubTimestampToTime(t *github.Timestamp) *time.Time { + if t == nil { + return nil + } + return &t.Time +} |