Skip to content

Rerun job only when run is done #34970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 6, 2025
Merged

Rerun job only when run is done #34970

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a7fed66
update
NorthRealm Jun 22, 2025
1b34325
update
NorthRealm Jun 24, 2025
9b8de2a
Merge branch 'main' into patch2
NorthRealm Jun 24, 2025
4957eb9
Merge branch 'go-gitea:main' into patch2
NorthRealm Jun 30, 2025
40e99e7
Merge branch 'go-gitea:main' into patch2
NorthRealm Jul 6, 2025
0236230
update
NorthRealm Jul 6, 2025
4a8e7e3
Merge branch 'main' into patch2
GiteaBot Jul 6, 2025
80533e4
Merge branch 'main' into patch2
GiteaBot Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions routers/web/repo/actions/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func ViewPost(ctx *context_module.Context) {
ID: v.ID,
Name: v.Name,
Status: v.Status.String(),
CanRerun: v.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions),
CanRerun: resp.State.Run.CanRerun && !v.Status.IsSkipped(),
Duration: v.Duration().String(),
})
}
Expand Down Expand Up @@ -445,7 +445,7 @@ func Rerun(ctx *context_module.Context) {
return
}
}
ctx.JSON(http.StatusOK, struct{}{})
ctx.JSONOK()
return
}

Expand All @@ -460,12 +460,12 @@ func Rerun(ctx *context_module.Context) {
}
}

ctx.JSON(http.StatusOK, struct{}{})
ctx.JSONOK()
}

func rerunJob(ctx *context_module.Context, job *actions_model.ActionRunJob, shouldBlock bool) error {
status := job.Status
if !status.IsDone() {
if !status.IsDone() || !job.Run.Status.IsDone() {
return nil
}

Expand Down
Loading