mirror of
https://github.com/go-gitea/gitea.git
synced 2025-07-12 15:39:45 +00:00
Rerun job only when run is done (#34970)
For consistency, limit rerunning Job(s) to only when Run is in Done status.
This commit is contained in:
parent
95a935aca0
commit
6b42ea1e54
@ -249,7 +249,7 @@ func ViewPost(ctx *context_module.Context) {
|
|||||||
ID: v.ID,
|
ID: v.ID,
|
||||||
Name: v.Name,
|
Name: v.Name,
|
||||||
Status: v.Status.String(),
|
Status: v.Status.String(),
|
||||||
CanRerun: v.Status.IsDone() && ctx.Repo.CanWrite(unit.TypeActions),
|
CanRerun: resp.State.Run.CanRerun,
|
||||||
Duration: v.Duration().String(),
|
Duration: v.Duration().String(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -445,7 +445,7 @@ func Rerun(ctx *context_module.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ctx.JSON(http.StatusOK, struct{}{})
|
ctx.JSONOK()
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -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 {
|
func rerunJob(ctx *context_module.Context, job *actions_model.ActionRunJob, shouldBlock bool) error {
|
||||||
status := job.Status
|
status := job.Status
|
||||||
if !status.IsDone() {
|
if !status.IsDone() || !job.Run.Status.IsDone() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user