tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-08-09 11:08:19 +00:00
Code Releases Activity

Fix auto concurrency cancellation skips commit status updates (#33764) (#33849)

Browse Source 
Backport #33764
* add missing commit status
* conflicts with concurrency support
This commit is contained in:
ChristopherHX
2025-03-11 17:51:58 +01:00
committed by GitHub
parent 6f8e62fa9c
commit fc82204fca
10 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routers/web/repo/actions/view.go
View File

@@ -903,7 +903,7 @@ func Run(ctx *context_module.Context) {
}
// cancel running jobs of the same workflow
if err := actions_model.CancelPreviousJobs(
if err := actions_service.CancelPreviousJobs(
ctx,
run.RepoID,
run.Ref,

3
routers/web/repo/setting/setting.go
View File

@@ -12,7 +12,6 @@ import (
"time"
"code.gitea.io/gitea/models"
actions_model "code.gitea.io/gitea/models/actions"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/organization"
"code.gitea.io/gitea/models/perm"
@@ -902,7 +901,7 @@ func SettingsPost(ctx *context.Context) {
return
}
if err := actions_model.CleanRepoScheduleTasks(ctx, repo); err != nil {
if err := actions_service.CleanRepoScheduleTasks(ctx, repo); err != nil {
log.Error("CleanRepoScheduleTasks for archived repo %s/%s: %v", ctx.Repo.Owner.Name, repo.Name, err)
}