Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5d2ed5a

Browse files
Merge branch 'main' into main
2 parentsd5dd799 +719b151 commit5d2ed5a

File tree

56 files changed

+2849
-263
lines changed

Some content is hidden

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

56 files changed

+2849
-263
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version":"lts"
88
},
99
"ghcr.io/devcontainers/features/git-lfs:1.2.2": {},
10-
"ghcr.io/devcontainers-contrib/features/poetry:2": {},
10+
"ghcr.io/devcontainers-extra/features/poetry:2": {},
1111
"ghcr.io/devcontainers/features/python:1": {
1212
"version":"3.12"
1313
},

‎models/actions/run.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,17 @@ func (run *ActionRun) GetPullRequestEventPayload() (*api.PullRequestPayload, err
166166
returnnil,fmt.Errorf("event %s is not a pull request event",run.Event)
167167
}
168168

169+
func (run*ActionRun)GetWorkflowRunEventPayload() (*api.WorkflowRunPayload,error) {
170+
ifrun.Event==webhook_module.HookEventWorkflowRun {
171+
varpayload api.WorkflowRunPayload
172+
iferr:=json.Unmarshal([]byte(run.EventPayload),&payload);err!=nil {
173+
returnnil,err
174+
}
175+
return&payload,nil
176+
}
177+
returnnil,fmt.Errorf("event %s is not a workflow run event",run.Event)
178+
}
179+
169180
func (run*ActionRun)IsSchedule()bool {
170181
returnrun.ScheduleID>0
171182
}

‎models/actions/run_job_list.go‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,22 +80,31 @@ type FindRunJobOptions struct {
8080
func (optsFindRunJobOptions)ToConds() builder.Cond {
8181
cond:=builder.NewCond()
8282
ifopts.RunID>0 {
83-
cond=cond.And(builder.Eq{"run_id":opts.RunID})
83+
cond=cond.And(builder.Eq{"`action_run_job`.run_id":opts.RunID})
8484
}
8585
ifopts.RepoID>0 {
86-
cond=cond.And(builder.Eq{"repo_id":opts.RepoID})
87-
}
88-
ifopts.OwnerID>0 {
89-
cond=cond.And(builder.Eq{"owner_id":opts.OwnerID})
86+
cond=cond.And(builder.Eq{"`action_run_job`.repo_id":opts.RepoID})
9087
}
9188
ifopts.CommitSHA!="" {
92-
cond=cond.And(builder.Eq{"commit_sha":opts.CommitSHA})
89+
cond=cond.And(builder.Eq{"`action_run_job`.commit_sha":opts.CommitSHA})
9390
}
9491
iflen(opts.Statuses)>0 {
95-
cond=cond.And(builder.In("status",opts.Statuses))
92+
cond=cond.And(builder.In("`action_run_job`.status",opts.Statuses))
9693
}
9794
ifopts.UpdatedBefore>0 {
98-
cond=cond.And(builder.Lt{"updated":opts.UpdatedBefore})
95+
cond=cond.And(builder.Lt{"`action_run_job`.updated":opts.UpdatedBefore})
9996
}
10097
returncond
10198
}
99+
100+
func (optsFindRunJobOptions)ToJoins() []db.JoinFunc {
101+
ifopts.OwnerID>0 {
102+
return []db.JoinFunc{
103+
func(sess db.Engine)error {
104+
sess.Join("INNER","repository","repository.id = repo_id AND repository.owner_id = ?",opts.OwnerID)
105+
returnnil
106+
},
107+
}
108+
}
109+
returnnil
110+
}

‎models/actions/run_list.go‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,39 +72,50 @@ type FindRunOptions struct {
7272
TriggerEvent webhook_module.HookEventType
7373
Approvedbool// not util.OptionalBool, it works only when it's true
7474
Status []Status
75+
CommitSHAstring
7576
}
7677

7778
func (optsFindRunOptions)ToConds() builder.Cond {
7879
cond:=builder.NewCond()
7980
ifopts.RepoID>0 {
80-
cond=cond.And(builder.Eq{"repo_id":opts.RepoID})
81-
}
82-
ifopts.OwnerID>0 {
83-
cond=cond.And(builder.Eq{"owner_id":opts.OwnerID})
81+
cond=cond.And(builder.Eq{"`action_run`.repo_id":opts.RepoID})
8482
}
8583
ifopts.WorkflowID!="" {
86-
cond=cond.And(builder.Eq{"workflow_id":opts.WorkflowID})
84+
cond=cond.And(builder.Eq{"`action_run`.workflow_id":opts.WorkflowID})
8785
}
8886
ifopts.TriggerUserID>0 {
89-
cond=cond.And(builder.Eq{"trigger_user_id":opts.TriggerUserID})
87+
cond=cond.And(builder.Eq{"`action_run`.trigger_user_id":opts.TriggerUserID})
9088
}
9189
ifopts.Approved {
92-
cond=cond.And(builder.Gt{"approved_by":0})
90+
cond=cond.And(builder.Gt{"`action_run`.approved_by":0})
9391
}
9492
iflen(opts.Status)>0 {
95-
cond=cond.And(builder.In("status",opts.Status))
93+
cond=cond.And(builder.In("`action_run`.status",opts.Status))
9694
}
9795
ifopts.Ref!="" {
98-
cond=cond.And(builder.Eq{"ref":opts.Ref})
96+
cond=cond.And(builder.Eq{"`action_run`.ref":opts.Ref})
9997
}
10098
ifopts.TriggerEvent!="" {
101-
cond=cond.And(builder.Eq{"trigger_event":opts.TriggerEvent})
99+
cond=cond.And(builder.Eq{"`action_run`.trigger_event":opts.TriggerEvent})
100+
}
101+
ifopts.CommitSHA!="" {
102+
cond=cond.And(builder.Eq{"`action_run`.commit_sha":opts.CommitSHA})
102103
}
103104
returncond
104105
}
105106

107+
func (optsFindRunOptions)ToJoins() []db.JoinFunc {
108+
ifopts.OwnerID>0 {
109+
return []db.JoinFunc{func(sess db.Engine)error {
110+
sess.Join("INNER","repository","repository.id = repo_id AND repository.owner_id = ?",opts.OwnerID)
111+
returnnil
112+
}}
113+
}
114+
returnnil
115+
}
116+
106117
func (optsFindRunOptions)ToOrders()string {
107-
return"`id` DESC"
118+
return"`action_run`.`id` DESC"
108119
}
109120

110121
typeStatusInfostruct {

‎models/fixtures/action_run.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
ref:"refs/heads/master"
1010
commit_sha:"c2d72f548424103f01ee1dc02889c1e2bff816b0"
1111
event:"push"
12+
trigger_event:"push"
1213
is_fork_pull_request:0
1314
status:1
1415
started:1683636528
@@ -28,6 +29,7 @@
2829
ref:"refs/heads/master"
2930
commit_sha:"c2d72f548424103f01ee1dc02889c1e2bff816b0"
3031
event:"push"
32+
trigger_event:"push"
3133
is_fork_pull_request:0
3234
status:1
3335
started:1683636528
@@ -47,6 +49,7 @@
4749
ref:"refs/heads/master"
4850
commit_sha:"c2d72f548424103f01ee1dc02889c1e2bff816b0"
4951
event:"push"
52+
trigger_event:"push"
5053
is_fork_pull_request:0
5154
status:6# running
5255
started:1683636528
@@ -66,6 +69,47 @@
6669
ref:"refs/heads/test"
6770
commit_sha:"c2d72f548424103f01ee1dc02889c1e2bff816b0"
6871
event:"push"
72+
trigger_event:"push"
73+
is_fork_pull_request:0
74+
status:1
75+
started:1683636528
76+
stopped:1683636626
77+
created:1683636108
78+
updated:1683636626
79+
need_approval:0
80+
approved_by:0
81+
-
82+
id:802
83+
title:"workflow run list"
84+
repo_id:5
85+
owner_id:3
86+
workflow_id:"test.yaml"
87+
index:191
88+
trigger_user_id:1
89+
ref:"refs/heads/test"
90+
commit_sha:"c2d72f548424103f01ee1dc02889c1e2bff816b0"
91+
event:"push"
92+
trigger_event:"push"
93+
is_fork_pull_request:0
94+
status:1
95+
started:1683636528
96+
stopped:1683636626
97+
created:1683636108
98+
updated:1683636626
99+
need_approval:0
100+
approved_by:0
101+
-
102+
id:803
103+
title:"workflow run list for user"
104+
repo_id:2
105+
owner_id:0
106+
workflow_id:"test.yaml"
107+
index:192
108+
trigger_user_id:1
109+
ref:"refs/heads/test"
110+
commit_sha:"c2d72f548424103f01ee1dc02889c1e2bff816b0"
111+
event:"push"
112+
trigger_event:"push"
69113
is_fork_pull_request:0
70114
status:1
71115
started:1683636528
@@ -86,6 +130,7 @@
86130
ref:"refs/heads/test"
87131
commit_sha:"c2d72f548424103f01ee1dc02889c1e2bff816b0"
88132
event:"push"
133+
trigger_event:"push"
89134
is_fork_pull_request:0
90135
status:2
91136
started:1683636528

‎models/fixtures/action_run_job.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,33 @@
9999
status:2
100100
started:1683636528
101101
stopped:1683636626
102+
-
103+
id:203
104+
run_id:802
105+
repo_id:5
106+
owner_id:0
107+
commit_sha:c2d72f548424103f01ee1dc02889c1e2bff816b0
108+
is_fork_pull_request:0
109+
name:job2
110+
attempt:1
111+
job_id:job2
112+
needs:'["job1"]'
113+
task_id:51
114+
status:5
115+
started:1683636528
116+
stopped:1683636626
117+
-
118+
id:204
119+
run_id:803
120+
repo_id:2
121+
owner_id:0
122+
commit_sha:c2d72f548424103f01ee1dc02889c1e2bff816b0
123+
is_fork_pull_request:0
124+
name:job2
125+
attempt:1
126+
job_id:job2
127+
needs:'["job1"]'
128+
task_id:51
129+
status:5
130+
started:1683636528
131+
stopped:1683636626

‎models/webhook/webhook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func TestWebhook_EventsArray(t *testing.T) {
7373
"pull_request","pull_request_assign","pull_request_label","pull_request_milestone",
7474
"pull_request_comment","pull_request_review_approved","pull_request_review_rejected",
7575
"pull_request_review_comment","pull_request_sync","pull_request_review_request","wiki","repository","release",
76-
"package","status","workflow_job",
76+
"package","status","workflow_run","workflow_job",
7777
},
7878
(&Webhook{
7979
HookEvent:&webhook_module.HookEvent{SendEverything:true},

‎modules/actions/workflows.go‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,10 @@ func detectMatched(gitRepo *git.Repository, commit *git.Commit, triggedEvent web
246246
webhook_module.HookEventPackage:
247247
returnmatchPackageEvent(payload.(*api.PackagePayload),evt)
248248

249+
case// workflow_run
250+
webhook_module.HookEventWorkflowRun:
251+
returnmatchWorkflowRunEvent(payload.(*api.WorkflowRunPayload),evt)
252+
249253
default:
250254
log.Warn("unsupported event %q",triggedEvent)
251255
returnfalse
@@ -691,3 +695,53 @@ func matchPackageEvent(payload *api.PackagePayload, evt *jobparser.Event) bool {
691695
}
692696
returnmatchTimes==len(evt.Acts())
693697
}
698+
699+
funcmatchWorkflowRunEvent(payload*api.WorkflowRunPayload,evt*jobparser.Event)bool {
700+
// with no special filter parameters
701+
iflen(evt.Acts())==0 {
702+
returntrue
703+
}
704+
705+
matchTimes:=0
706+
// all acts conditions should be satisfied
707+
forcond,vals:=rangeevt.Acts() {
708+
switchcond {
709+
case"types":
710+
action:=payload.Action
711+
for_,val:=rangevals {
712+
ifglob.MustCompile(val,'/').Match(action) {
713+
matchTimes++
714+
break
715+
}
716+
}
717+
case"workflows":
718+
workflow:=payload.Workflow
719+
patterns,err:=workflowpattern.CompilePatterns(vals...)
720+
iferr!=nil {
721+
break
722+
}
723+
if!workflowpattern.Skip(patterns, []string{workflow.Name},&workflowpattern.EmptyTraceWriter{}) {
724+
matchTimes++
725+
}
726+
case"branches":
727+
patterns,err:=workflowpattern.CompilePatterns(vals...)
728+
iferr!=nil {
729+
break
730+
}
731+
if!workflowpattern.Skip(patterns, []string{payload.WorkflowRun.HeadBranch},&workflowpattern.EmptyTraceWriter{}) {
732+
matchTimes++
733+
}
734+
case"branches-ignore":
735+
patterns,err:=workflowpattern.CompilePatterns(vals...)
736+
iferr!=nil {
737+
break
738+
}
739+
if!workflowpattern.Filter(patterns, []string{payload.WorkflowRun.HeadBranch},&workflowpattern.EmptyTraceWriter{}) {
740+
matchTimes++
741+
}
742+
default:
743+
log.Warn("workflow run event unsupported condition %q",cond)
744+
}
745+
}
746+
returnmatchTimes==len(evt.Acts())
747+
}

‎modules/packages/container/metadata.go‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
package container
55

66
import (
7-
"errors"
87
"fmt"
98
"io"
109
"strings"
@@ -72,20 +71,39 @@ type Manifest struct {
7271
Sizeint64`json:"size"`
7372
}
7473

74+
funcIsMediaTypeValid(mtstring)bool {
75+
returnstrings.HasPrefix(mt,"application/vnd.docker.")||strings.HasPrefix(mt,"application/vnd.oci.")
76+
}
77+
78+
funcIsMediaTypeImageManifest(mtstring)bool {
79+
returnstrings.EqualFold(mt,oci.MediaTypeImageManifest)||strings.EqualFold(mt,"application/vnd.docker.distribution.manifest.v2+json")
80+
}
81+
82+
funcIsMediaTypeImageIndex(mtstring)bool {
83+
returnstrings.EqualFold(mt,oci.MediaTypeImageIndex)||strings.EqualFold(mt,"application/vnd.docker.distribution.manifest.list.v2+json")
84+
}
85+
7586
// ParseImageConfig parses the metadata of an image config
76-
funcParseImageConfig(mtstring,r io.Reader) (*Metadata,error) {
77-
ifstrings.EqualFold(mt,helm.ConfigMediaType) {
87+
funcParseImageConfig(mediaTypestring,r io.Reader) (*Metadata,error) {
88+
ifstrings.EqualFold(mediaType,helm.ConfigMediaType) {
7889
returnparseHelmConfig(r)
7990
}
8091

8192
// fallback to OCI Image Config
82-
returnparseOCIImageConfig(r)
93+
// FIXME: this fallback is not right, we should strictly check the media type in the future
94+
metadata,err:=parseOCIImageConfig(r)
95+
iferr!=nil {
96+
if!IsMediaTypeImageManifest(mediaType) {
97+
return&Metadata{Platform:"unknown/unknown"},nil
98+
}
99+
returnnil,err
100+
}
101+
returnmetadata,nil
83102
}
84103

85104
funcparseOCIImageConfig(r io.Reader) (*Metadata,error) {
86105
varimage oci.Image
87-
// EOF means empty input, still use the default data
88-
iferr:=json.NewDecoder(r).Decode(&image);err!=nil&&!errors.Is(err,io.EOF) {
106+
iferr:=json.NewDecoder(r).Decode(&image);err!=nil {
89107
returnnil,err
90108
}
91109

‎modules/packages/container/metadata_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,8 @@ func TestParseImageConfig(t *testing.T) {
5959
assert.ElementsMatch(t, []string{author},metadata.Authors)
6060
assert.Equal(t,projectURL,metadata.ProjectURL)
6161
assert.Equal(t,repositoryURL,metadata.RepositoryURL)
62-
}
6362

64-
funcTestParseOCIImageConfig(t*testing.T) {
65-
metadata,err:=parseOCIImageConfig(strings.NewReader(""))
63+
metadata,err=ParseImageConfig("anything-unknown",strings.NewReader(""))
6664
require.NoError(t,err)
67-
assert.Equal(t,&Metadata{Type:TypeOCI,Platform:DefaultPlatform,ImageLayers: []string{}},metadata)
65+
assert.Equal(t,&Metadata{Platform:"unknown/unknown"},metadata)
6866
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp