aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Song <i@wolfogre.com>2023-03-30 22:33:17 +0800
committerGitHub <noreply@github.com>2023-03-30 22:33:17 +0800
commit964a057a76793c32c81394505e2f480a4bf40d0d (patch)
treeff1cb54f30b43741c4a8c881ca0f2f0a7555e0c5
parentaa4d1d94f79e8edd9fa9ff2813fea12b085b2cae (diff)
downloadgitea-964a057a76793c32c81394505e2f480a4bf40d0d.tar.gz
gitea-964a057a76793c32c81394505e2f480a4bf40d0d.zip
Fix checks for `needs` in Actions (#23789)
Fix: - https://gitea.com/gitea/act_runner/issues/77 - https://gitea.com/gitea/act_runner/issues/81 Before: <img width="1489" alt="image" src="https://user-images.githubusercontent.com/9418365/228501567-f752cf87-a7ed-42c6-8f3d-ba741795c1fe.png"> Highlights: - Upgrade act to make things doable, related to - https://gitea.com/gitea/act/pulls/32 - https://gitea.com/gitea/act/pulls/33 - https://gitea.com/gitea/act/pulls/35 - Make `needs` works - Sort jobs in the original order in the workflow files
-rw-r--r--go.mod2
-rw-r--r--go.sum4
-rw-r--r--models/actions/run.go4
-rw-r--r--modules/actions/workflows.go28
-rw-r--r--web_src/js/components/RepoActionView.vue5
5 files changed, 22 insertions, 21 deletions
diff --git a/go.mod b/go.mod
index ba7ab27c19..1ee95b9f59 100644
--- a/go.mod
+++ b/go.mod
@@ -289,7 +289,7 @@ replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142
replace github.com/blevesearch/zapx/v15 v15.3.6 => github.com/zeripath/zapx/v15 v15.3.6-alignment-fix
-replace github.com/nektos/act => gitea.com/gitea/act v0.243.1
+replace github.com/nektos/act => gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab
exclude github.com/gofrs/uuid v3.2.0+incompatible
diff --git a/go.sum b/go.sum
index 0faea93e22..6bbbbf6eea 100644
--- a/go.sum
+++ b/go.sum
@@ -52,8 +52,8 @@ codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570/go.mod h1:IIAjsi
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4HHsCo6xi2oWZYKWW4bly/Ory9FuTpFPRxj/mAg=
git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs=
-gitea.com/gitea/act v0.243.1 h1:zIVlhGOLE4SHFPW++u3+5Y/jX5mub3QIhB13oNf6rtA=
-gitea.com/gitea/act v0.243.1/go.mod h1:iLHCXqOPUElA2nSyHo4wtxSmvdkym3WU7CkP3AxF39Q=
+gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab h1:HDImhO/XpMJrw2PJcADI/wgur9Gro/pegLFaRt8Wpg0=
+gitea.com/gitea/act v0.243.2-0.20230329055922-5e76853b55ab/go.mod h1:mabw6AZAiDgxGlK83orWLrNERSPvgBJzEUS3S7u2bHI=
gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681 h1:MMSPgnVULVwV9kEBgvyEUhC9v/uviZ55hPJEMjpbNR4=
gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc=
gitea.com/go-chi/cache v0.0.0-20210110083709-82c4c9ce2d5e/go.mod h1:k2V/gPDEtXGjjMGuBJiapffAXTv76H4snSmlJRLUhH0=
diff --git a/models/actions/run.go b/models/actions/run.go
index 1af8f897fa..22041b65a9 100644
--- a/models/actions/run.go
+++ b/models/actions/run.go
@@ -197,7 +197,9 @@ func InsertRun(ctx context.Context, run *ActionRun, jobs []*jobparser.SingleWork
for _, v := range jobs {
id, job := v.Job()
needs := job.Needs()
- job.EraseNeeds()
+ if err := v.SetJob(id, job.EraseNeeds()); err != nil {
+ return err
+ }
payload, _ := v.Marshal()
status := StatusWaiting
if len(needs) > 0 || run.NeedApproval {
diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go
index 1b8b6cc7ef..76c144bb2b 100644
--- a/modules/actions/workflows.go
+++ b/modules/actions/workflows.go
@@ -122,8 +122,8 @@ func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType
webhook_module.HookEventRepository,
webhook_module.HookEventRelease,
webhook_module.HookEventPackage:
- if len(evt.Acts) != 0 {
- log.Warn("Ignore unsupported %s event arguments %q", triggedEvent, evt.Acts)
+ if len(evt.Acts()) != 0 {
+ log.Warn("Ignore unsupported %s event arguments %v", triggedEvent, evt.Acts())
}
// no special filter parameters for these events, just return true if name matched
return true
@@ -148,7 +148,7 @@ func detectMatched(commit *git.Commit, triggedEvent webhook_module.HookEventType
func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobparser.Event) bool {
// with no special filter parameters
- if len(evt.Acts) == 0 {
+ if len(evt.Acts()) == 0 {
return true
}
@@ -157,7 +157,7 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
hasTagFilter := false
refName := git.RefName(pushPayload.Ref)
// all acts conditions should be satisfied
- for cond, vals := range evt.Acts {
+ for cond, vals := range evt.Acts() {
switch cond {
case "branches":
hasBranchFilter = true
@@ -241,18 +241,18 @@ func matchPushEvent(commit *git.Commit, pushPayload *api.PushPayload, evt *jobpa
if hasBranchFilter && hasTagFilter {
matchTimes++
}
- return matchTimes == len(evt.Acts)
+ return matchTimes == len(evt.Acts())
}
func matchIssuesEvent(commit *git.Commit, issuePayload *api.IssuePayload, evt *jobparser.Event) bool {
// with no special filter parameters
- if len(evt.Acts) == 0 {
+ if len(evt.Acts()) == 0 {
return true
}
matchTimes := 0
// all acts conditions should be satisfied
- for cond, vals := range evt.Acts {
+ for cond, vals := range evt.Acts() {
switch cond {
case "types":
for _, val := range vals {
@@ -265,19 +265,19 @@ func matchIssuesEvent(commit *git.Commit, issuePayload *api.IssuePayload, evt *j
log.Warn("issue event unsupported condition %q", cond)
}
}
- return matchTimes == len(evt.Acts)
+ return matchTimes == len(evt.Acts())
}
func matchPullRequestEvent(commit *git.Commit, prPayload *api.PullRequestPayload, evt *jobparser.Event) bool {
// with no special filter parameters
- if len(evt.Acts) == 0 {
+ if len(evt.Acts()) == 0 {
// defaultly, only pull request opened and synchronized will trigger workflow
return prPayload.Action == api.HookIssueSynchronized || prPayload.Action == api.HookIssueOpened
}
matchTimes := 0
// all acts conditions should be satisfied
- for cond, vals := range evt.Acts {
+ for cond, vals := range evt.Acts() {
switch cond {
case "types":
action := prPayload.Action
@@ -339,18 +339,18 @@ func matchPullRequestEvent(commit *git.Commit, prPayload *api.PullRequestPayload
log.Warn("pull request event unsupported condition %q", cond)
}
}
- return matchTimes == len(evt.Acts)
+ return matchTimes == len(evt.Acts())
}
func matchIssueCommentEvent(commit *git.Commit, issueCommentPayload *api.IssueCommentPayload, evt *jobparser.Event) bool {
// with no special filter parameters
- if len(evt.Acts) == 0 {
+ if len(evt.Acts()) == 0 {
return true
}
matchTimes := 0
// all acts conditions should be satisfied
- for cond, vals := range evt.Acts {
+ for cond, vals := range evt.Acts() {
switch cond {
case "types":
for _, val := range vals {
@@ -363,5 +363,5 @@ func matchIssueCommentEvent(commit *git.Commit, issueCommentPayload *api.IssueCo
log.Warn("issue comment unsupported condition %q", cond)
}
}
- return matchTimes == len(evt.Acts)
+ return matchTimes == len(evt.Acts())
}
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 72801725d0..ebc42829b4 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -1,7 +1,7 @@
<template>
<div class="action-view-container">
<div class="action-view-header">
- <div class="action-info-summary">
+ <div class="action-info-summary gt-ac">
<ActionRunStatus :status="run.status" :size="20"/>
<div class="action-title">
{{ run.title }}
@@ -30,7 +30,7 @@
<div class="job-brief-item" v-for="(job, index) in run.jobs" :key="job.id">
<a class="job-brief-link" :href="run.link+'/jobs/'+index">
<ActionRunStatus :status="job.status"/>
- <span class="ui text">{{ job.name }}</span>
+ <span class="ui text gt-mx-3">{{ job.name }}</span>
</a>
<button class="job-brief-rerun" @click="rerunJob(index)" v-if="job.canRerun">
<SvgIcon name="octicon-sync" class="ui text black"/>
@@ -404,7 +404,6 @@ export function initRepositoryActionView() {
}
.job-group-section .job-brief-list .job-brief-item .job-brief-link span {
- margin-right: 8px;
display: flex;
align-items: center;
}