Skip to content

Commit 8e4adf4

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: API: enhance SearchIssues swagger docs (go-gitea#32208) Update github.com/go-enry/go-enry to v2.9.1 (go-gitea#32295) Always update expiration time when creating an artifact (go-gitea#32281) Add `gh-access-token` flag into backport script (go-gitea#32283)
2 parents b31436d + d638067 commit 8e4adf4

File tree

6 files changed

+95
-42
lines changed

6 files changed

+95
-42
lines changed

‎contrib/backport/backport.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@ func main() {
6464
Value: "",
6565
Usage: "Forked user name on Github",
6666
},
67+
&cli.StringFlag{
68+
Name: "gh-access-token",
69+
Value: "",
70+
Usage: "Access token for GitHub api request",
71+
},
6772
&cli.BoolFlag{
6873
Name: "no-fetch",
6974
Usage: "Set this flag to prevent fetch of remote branches",
@@ -169,9 +174,10 @@ func runBackport(c *cli.Context) error {
169174
fmt.Printf("* Backporting %s to %s as %s\n", pr, localReleaseBranch, backportBranch)
170175

171176
sha := c.String("cherry-pick")
177+
accessToken := c.String("gh-access-token")
172178
if sha == "" {
173179
var err error
174-
sha, err = determineSHAforPR(ctx, pr)
180+
sha, err = determineSHAforPR(ctx, pr, accessToken)
175181
if err != nil {
176182
return err
177183
}
@@ -427,13 +433,16 @@ func readVersion() string {
427433
return strings.Join(split[:2], ".")
428434
}
429435

430-
func determineSHAforPR(ctx context.Context, prStr string) (string, error) {
436+
func determineSHAforPR(ctx context.Context, prStr, accessToken string) (string, error) {
431437
prNum, err := strconv.Atoi(prStr)
432438
if err != nil {
433439
return "", err
434440
}
435441

436442
client := github.NewClient(http.DefaultClient)
443+
if accessToken != "" {
444+
client = client.WithAuthToken(accessToken)
445+
}
437446

438447
pr, _, err := client.PullRequests.Get(ctx, "go-gitea", "gitea", prNum)
439448
if err != nil {

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ require (
5454
github.com/go-chi/chi/v5 v5.0.13
5555
github.com/go-chi/cors v1.2.1
5656
github.com/go-co-op/gocron v1.37.0
57-
github.com/go-enry/go-enry/v2 v2.8.8
57+
github.com/go-enry/go-enry/v2 v2.9.1
5858
github.com/go-git/go-billy/v5 v5.5.0
5959
github.com/go-git/go-git/v5 v5.12.0
6060
github.com/go-ldap/ldap/v3 v3.4.6

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
315315
github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
316316
github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
317317
github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
318-
github.com/go-enry/go-enry/v2 v2.8.8 h1:EhfxWpw4DQ3WEFB1Y77X8vKqZL0D0EDUUWYDUAIv9/4=
319-
github.com/go-enry/go-enry/v2 v2.8.8/go.mod h1:9yrj4ES1YrbNb1Wb7/PWYr2bpaCXUGRt0uafN0ISyG8=
318+
github.com/go-enry/go-enry/v2 v2.9.1 h1:G9iDteJ/Mc0F4Di5NeQknf83R2OkRbwY9cAYmcqVG6U=
319+
github.com/go-enry/go-enry/v2 v2.9.1/go.mod h1:9yrj4ES1YrbNb1Wb7/PWYr2bpaCXUGRt0uafN0ISyG8=
320320
github.com/go-enry/go-oniguruma v1.2.1 h1:k8aAMuJfMrqm/56SG2lV9Cfti6tC4x8673aHCcBk+eo=
321321
github.com/go-enry/go-oniguruma v1.2.1/go.mod h1:bWDhYP+S6xZQgiRL7wlTScFYBe023B6ilRZbCAD5Hf4=
322322
github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=

‎models/actions/artifact.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func CreateArtifact(ctx context.Context, t *ActionTask, artifactName, artifactPa
6969
OwnerID: t.OwnerID,
7070
CommitSHA: t.CommitSHA,
7171
Status: int64(ArtifactStatusUploadPending),
72-
ExpiredUnix: timeutil.TimeStamp(time.Now().Unix() + 3600*24*expiredDays),
72+
ExpiredUnix: timeutil.TimeStamp(time.Now().Unix() + timeutil.Day*expiredDays),
7373
}
7474
if _, err := db.GetEngine(ctx).Insert(artifact); err != nil {
7575
return nil, err
@@ -78,6 +78,13 @@ func CreateArtifact(ctx context.Context, t *ActionTask, artifactName, artifactPa
7878
} else if err != nil {
7979
return nil, err
8080
}
81+
82+
if _, err := db.GetEngine(ctx).ID(artifact.ID).Cols("expired_unix").Update(&ActionArtifact{
83+
ExpiredUnix: timeutil.TimeStamp(time.Now().Unix() + timeutil.Day*expiredDays),
84+
}); err != nil {
85+
return nil, err
86+
}
87+
8188
return artifact, nil
8289
}
8390

‎routers/api/v1/repo/issue.go

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,80 +41,93 @@ func SearchIssues(ctx *context.APIContext) {
4141
// parameters:
4242
// - name: state
4343
// in: query
44-
// description: whether issue is open or closed
44+
// description: State of the issue
4545
// type: string
46+
// enum: [open, closed, all]
47+
// default: open
4648
// - name: labels
4749
// in: query
48-
// description: comma separated list of labels. Fetch only issues that have any of this labels. Non existent labels are discarded
50+
// description: Comma-separated list of label names. Fetch only issues that have any of these labels. Non existent labels are discarded.
4951
// type: string
5052
// - name: milestones
5153
// in: query
52-
// description: comma separated list of milestone names. Fetch only issues that have any of this milestones. Non existent are discarded
54+
// description: Comma-separated list of milestone names. Fetch only issues that have any of these milestones. Non existent milestones are discarded.
5355
// type: string
5456
// - name: q
5557
// in: query
56-
// description: search string
58+
// description: Search string
5759
// type: string
5860
// - name: priority_repo_id
5961
// in: query
60-
// description: repository to prioritize in the results
62+
// description: Repository ID to prioritize in the results
6163
// type: integer
6264
// format: int64
6365
// - name: type
6466
// in: query
65-
// description: filter by type (issues / pulls) if set
67+
// description: Filter by issue type
6668
// type: string
69+
// enum: [issues, pulls]
6770
// - name: since
6871
// in: query
69-
// description: Only show notifications updated after the given time. This is a timestamp in RFC 3339 format
72+
// description: Only show issues updated after the given time (RFC 3339 format)
7073
// type: string
7174
// format: date-time
72-
// required: false
7375
// - name: before
7476
// in: query
75-
// description: Only show notifications updated before the given time. This is a timestamp in RFC 3339 format
77+
// description: Only show issues updated before the given time (RFC 3339 format)
7678
// type: string
7779
// format: date-time
78-
// required: false
7980
// - name: assigned
8081
// in: query
81-
// description: filter (issues / pulls) assigned to you, default is false
82+
// description: Filter issues or pulls assigned to the authenticated user
8283
// type: boolean
84+
// default: false
8385
// - name: created
8486
// in: query
85-
// description: filter (issues / pulls) created by you, default is false
87+
// description: Filter issues or pulls created by the authenticated user
8688
// type: boolean
89+
// default: false
8790
// - name: mentioned
8891
// in: query
89-
// description: filter (issues / pulls) mentioning you, default is false
92+
// description: Filter issues or pulls mentioning the authenticated user
9093
// type: boolean
94+
// default: false
9195
// - name: review_requested
9296
// in: query
93-
// description: filter pulls requesting your review, default is false
97+
// description: Filter pull requests where the authenticated user's review was requested
9498
// type: boolean
99+
// default: false
95100
// - name: reviewed
96101
// in: query
97-
// description: filter pulls reviewed by you, default is false
102+
// description: Filter pull requests reviewed by the authenticated user
98103
// type: boolean
104+
// default: false
99105
// - name: owner
100106
// in: query
101-
// description: filter by owner
107+
// description: Filter by repository owner
102108
// type: string
103109
// - name: team
104110
// in: query
105-
// description: filter by team (requires organization owner parameter to be provided)
111+
// description: Filter by team (requires organization owner parameter)
106112
// type: string
107113
// - name: page
108114
// in: query
109-
// description: page number of results to return (1-based)
115+
// description: Page number of results to return (1-based)
110116
// type: integer
117+
// minimum: 1
118+
// default: 1
111119
// - name: limit
112120
// in: query
113-
// description: page size of results
121+
// description: Number of items per page
114122
// type: integer
123+
// minimum: 0
115124
// responses:
116125
// "200":
117126
// "$ref": "#/responses/IssueList"
127+
// "400":
128+
// "$ref": "#/responses/error"
129+
// "422":
130+
// "$ref": "#/responses/validationError"
118131

119132
before, since, err := context.GetQueryBeforeSince(ctx.Base)
120133
if err != nil {

‎templates/swagger/v1_json.tmpl

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

0 commit comments

Comments
 (0)