From 21789251182a5c4ca21991e836388c6b6d77dadb Mon Sep 17 00:00:00 2001 From: Michael Kriese Date: Mon, 8 Apr 2024 09:59:55 +0200 Subject: [PATCH] fix(actions): call automerge service on successful commit state --- services/actions/commit_status.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/services/actions/commit_status.go b/services/actions/commit_status.go index 42365539271be..8e5b17f38d9ae 100644 --- a/services/actions/commit_status.go +++ b/services/actions/commit_status.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/log" api "code.gitea.io/gitea/modules/structs" webhook_module "code.gitea.io/gitea/modules/webhook" + "code.gitea.io/gitea/services/automerge" "github.com/nektos/act/pkg/jobparser" ) @@ -138,6 +139,12 @@ func createCommitStatus(ctx context.Context, job *actions_model.ActionRunJob) er return fmt.Errorf("NewCommitStatus: %w", err) } + if state.IsSuccess() { + if err := automerge.MergeScheduledPullRequest(ctx, sha, repo); err != nil { + return fmt.Errorf("MergeScheduledPullRequest[repo_id: %d, user_id: %d, sha: %s]: %w", repo.ID, creator.ID, sha, err) + } + } + return nil }