Skip to content

Commit 1ee4530

Browse files
harryzcyharryzcy
authored
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`
1 parent 5e1bd8a commit 1ee4530

File tree

6 files changed

+45
-38
lines changed

6 files changed

+45
-38
lines changed

‎assets/go-licenses.json

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

‎contrib/backport/backport.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"strings"
1717
"syscall"
1818

19-
"github.com/google/go-github/v45/github"
19+
"github.com/google/go-github/v51/github"
2020
"github.com/urfave/cli"
2121
"gopkg.in/yaml.v3"
2222
)

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
github.com/gogs/cron v0.0.0-20171120032916-9f6c956d3e14
5555
github.com/gogs/go-gogs-client v0.0.0-20210131175652-1d7215cd8d85
5656
github.com/golang-jwt/jwt/v4 v4.5.0
57-
github.com/google/go-github/v45 v45.2.0
57+
github.com/google/go-github/v51 v51.0.0
5858
github.com/google/pprof v0.0.0-20230222194610-99052d3372e7
5959
github.com/google/uuid v1.3.0
6060
github.com/gorilla/feeds v1.1.1
@@ -103,11 +103,11 @@ require (
103103
github.com/yuin/goldmark v1.5.4
104104
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87
105105
github.com/yuin/goldmark-meta v1.1.0
106-
golang.org/x/crypto v0.6.0
107-
golang.org/x/net v0.7.0
108-
golang.org/x/oauth2 v0.5.0
106+
golang.org/x/crypto v0.7.0
107+
golang.org/x/net v0.8.0
108+
golang.org/x/oauth2 v0.6.0
109109
golang.org/x/sys v0.6.0
110-
golang.org/x/text v0.7.0
110+
golang.org/x/text v0.8.0
111111
golang.org/x/tools v0.6.0
112112
google.golang.org/grpc v1.53.0
113113
google.golang.org/protobuf v1.28.1

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -558,8 +558,8 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
558558
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
559559
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
560560
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
561-
github.com/google/go-github/v45 v45.2.0 h1:5oRLszbrkvxDDqBCNj2hjDZMKmvexaZ1xw/FCD+K3FI=
562-
github.com/google/go-github/v45 v45.2.0/go.mod h1:FObaZJEDSTa/WGCzZ2Z3eoCDXWJKMenWWTrd8jrta28=
561+
github.com/google/go-github/v51 v51.0.0 h1:KCjsbgPV28VoRftdP+K2mQL16jniUsLAJknsOVKwHyU=
562+
github.com/google/go-github/v51 v51.0.0/go.mod h1:kZj/rn/c1lSUbr/PFWl2hhusPV7a5XNYKcwPrd5L3Us=
563563
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
564564
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
565565
github.com/google/go-tpm v0.1.2-0.20190725015402-ae6dd98980d4/go.mod h1:H9HbmUG2YgV/PHITkO7p6wxEEj/v5nlsVWIwumwH2NI=
@@ -1307,8 +1307,8 @@ golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0
13071307
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
13081308
golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
13091309
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
1310-
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
1311-
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
1310+
golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
1311+
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
13121312
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
13131313
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
13141314
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -1404,8 +1404,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
14041404
golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
14051405
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
14061406
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
1407-
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
1408-
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
1407+
golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
1408+
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
14091409
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
14101410
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
14111411
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1417,8 +1417,8 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ
14171417
golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
14181418
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
14191419
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
1420-
golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=
1421-
golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
1420+
golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw=
1421+
golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
14221422
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
14231423
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
14241424
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -1539,8 +1539,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
15391539
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
15401540
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
15411541
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
1542-
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
1543-
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
1542+
golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
1543+
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
15441544
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
15451545
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
15461546
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎services/migrations/error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package migrations
77
import (
88
"errors"
99

10-
"github.com/google/go-github/v45/github"
10+
"github.com/google/go-github/v51/github"
1111
)
1212

1313
// ErrRepoNotCreated returns the error that repository not created

‎services/migrations/github.go

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"code.gitea.io/gitea/modules/structs"
2222
"code.gitea.io/gitea/modules/util"
2323

24-
"github.com/google/go-github/v45/github"
24+
"github.com/google/go-github/v51/github"
2525
"golang.org/x/oauth2"
2626
)
2727

@@ -259,11 +259,11 @@ func (g *GithubDownloaderV3) GetMilestones() ([]*base.Milestone, error) {
259259
milestones = append(milestones, &base.Milestone{
260260
Title: m.GetTitle(),
261261
Description: m.GetDescription(),
262-
Deadline: m.DueOn,
262+
Deadline: convertGithubTimestampToTime(m.DueOn),
263263
State: state,
264-
Created: m.GetCreatedAt(),
265-
Updated: m.UpdatedAt,
266-
Closed: m.ClosedAt,
264+
Created: m.GetCreatedAt().Time,
265+
Updated: convertGithubTimestampToTime(m.UpdatedAt),
266+
Closed: convertGithubTimestampToTime(m.ClosedAt),
267267
})
268268
}
269269
if len(ms) < perPage {
@@ -486,11 +486,11 @@ func (g *GithubDownloaderV3) GetIssues(page, perPage int) ([]*base.Issue, bool,
486486
Content: issue.GetBody(),
487487
Milestone: issue.GetMilestone().GetTitle(),
488488
State: issue.GetState(),
489-
Created: issue.GetCreatedAt(),
490-
Updated: issue.GetUpdatedAt(),
489+
Created: issue.GetCreatedAt().Time,
490+
Updated: issue.GetUpdatedAt().Time,
491491
Labels: labels,
492492
Reactions: reactions,
493-
Closed: issue.ClosedAt,
493+
Closed: &issue.ClosedAt.Time,
494494
IsLocked: issue.GetLocked(),
495495
Assignees: assignees,
496496
ForeignIndex: int64(*issue.Number),
@@ -565,8 +565,8 @@ func (g *GithubDownloaderV3) getComments(commentable base.Commentable) ([]*base.
565565
PosterName: comment.GetUser().GetLogin(),
566566
PosterEmail: comment.GetUser().GetEmail(),
567567
Content: comment.GetBody(),
568-
Created: comment.GetCreatedAt(),
569-
Updated: comment.GetUpdatedAt(),
568+
Created: comment.GetCreatedAt().Time,
569+
Updated: comment.GetUpdatedAt().Time,
570570
Reactions: reactions,
571571
})
572572
}
@@ -641,8 +641,8 @@ func (g *GithubDownloaderV3) GetAllComments(page, perPage int) ([]*base.Comment,
641641
PosterName: comment.GetUser().GetLogin(),
642642
PosterEmail: comment.GetUser().GetEmail(),
643643
Content: comment.GetBody(),
644-
Created: comment.GetCreatedAt(),
645-
Updated: comment.GetUpdatedAt(),
644+
Created: comment.GetCreatedAt().Time,
645+
Updated: comment.GetUpdatedAt().Time,
646646
Reactions: reactions,
647647
})
648648
}
@@ -716,13 +716,13 @@ func (g *GithubDownloaderV3) GetPullRequests(page, perPage int) ([]*base.PullReq
716716
Content: pr.GetBody(),
717717
Milestone: pr.GetMilestone().GetTitle(),
718718
State: pr.GetState(),
719-
Created: pr.GetCreatedAt(),
720-
Updated: pr.GetUpdatedAt(),
721-
Closed: pr.ClosedAt,
719+
Created: pr.GetCreatedAt().Time,
720+
Updated: pr.GetUpdatedAt().Time,
721+
Closed: convertGithubTimestampToTime(pr.ClosedAt),
722722
Labels: labels,
723723
Merged: pr.MergedAt != nil,
724724
MergeCommitSHA: pr.GetMergeCommitSHA(),
725-
MergedTime: pr.MergedAt,
725+
MergedTime: convertGithubTimestampToTime(pr.MergedAt),
726726
IsLocked: pr.ActiveLockReason != nil,
727727
Head: base.PullRequestBranch{
728728
Ref: pr.GetHead().GetRef(),
@@ -756,7 +756,7 @@ func convertGithubReview(r *github.PullRequestReview) *base.Review {
756756
ReviewerName: r.GetUser().GetLogin(),
757757
CommitID: r.GetCommitID(),
758758
Content: r.GetBody(),
759-
CreatedAt: r.GetSubmittedAt(),
759+
CreatedAt: r.GetSubmittedAt().Time,
760760
State: r.GetState(),
761761
}
762762
}
@@ -800,8 +800,8 @@ func (g *GithubDownloaderV3) convertGithubReviewComments(cs []*github.PullReques
800800
CommitID: c.GetCommitID(),
801801
PosterID: c.GetUser().GetID(),
802802
Reactions: reactions,
803-
CreatedAt: c.GetCreatedAt(),
804-
UpdatedAt: c.GetUpdatedAt(),
803+
CreatedAt: c.GetCreatedAt().Time,
804+
UpdatedAt: c.GetUpdatedAt().Time,
805805
})
806806
}
807807
return rcs, nil
@@ -881,3 +881,10 @@ func (g *GithubDownloaderV3) GetReviews(reviewable base.Reviewable) ([]*base.Rev
881881
}
882882
return allReviews, nil
883883
}
884+
885+
func convertGithubTimestampToTime(t *github.Timestamp) *time.Time {
886+
if t == nil {
887+
return nil
888+
}
889+
return &t.Time
890+
}

0 commit comments

Comments
 (0)