diff --git a/modules/actions/workflows.go b/modules/actions/workflows.go index 94873ea125f..e9271c14384 100644 --- a/modules/actions/workflows.go +++ b/modules/actions/workflows.go @@ -561,7 +561,7 @@ func matchPullRequestEvent(ctx context.Context, gitRepo *git.Repository, commit headCommit = commit err error ) - if evt.Name == GithubEventPullRequestTarget && (len(acts["paths"]) > 0 || len(acts["paths-ignore"]) > 0) { + if (len(acts["paths"]) > 0 || len(acts["paths-ignore"]) > 0) && commit.ID.String() != prPayload.PullRequest.Head.Sha { headCommit, err = gitRepo.GetCommit(ctx, prPayload.PullRequest.Head.Sha) if err != nil { log.Error("GetCommit [ref: %s]: %v", prPayload.PullRequest.Head.Sha, err) diff --git a/modules/git/config.go b/modules/git/config.go index f52080a7af9..a712ab9f884 100644 --- a/modules/git/config.go +++ b/modules/git/config.go @@ -131,6 +131,10 @@ func syncGitConfig(ctx context.Context) (err error) { } } + if err := configAddNonExist(ctx, "transfer.hideRefs", hiddenRefPrefix); err != nil { // after the user's options, which replace all values + return err + } + GlobalConfig = &GlobalConfigStruct{} // HINT: GIT-DIFF-TREE-UI-CONFIG: Git's bug: git-diff-tree loads config with /* no "diff" UI options */ (since 20 years ago). // https://github.com/git/git/blame/5d2e7709234afea1b6ddb25cd4f60d3d5fb3c200/builtin/diff-tree.c#L127 diff --git a/modules/git/merge_tree.go b/modules/git/merge_tree.go index f956a54e6f0..6ab4651ea75 100644 --- a/modules/git/merge_tree.go +++ b/modules/git/merge_tree.go @@ -18,9 +18,11 @@ const MaxConflictedDetectFiles = 10 // It returns the resulting tree hash, a list of conflicted files (if any), and an error if the operation fails. // If there are no conflicts, the list of conflicted files will be nil. func MergeTree(ctx context.Context, repo RepositoryFacade, baseRef, headRef, mergeBase string) (treeID string, isErrHasConflicts bool, conflictFiles []string, _ error) { - cmd := gitcmd.NewCommand("merge-tree", "--write-tree", "-z", "--name-only", "--no-messages"). - AddOptionFormat("--merge-base=%s", mergeBase). - AddDynamicArguments(baseRef, headRef) + cmd := gitcmd.NewCommand("merge-tree", "--write-tree", "-z", "--name-only", "--no-messages") + if mergeBase != "" { + cmd.AddOptionFormat("--merge-base=%s", mergeBase) + } + cmd.AddDynamicArguments(baseRef, headRef) stdout, stdoutClose := cmd.MakeStdoutPipe() defer stdoutClose() diff --git a/modules/git/ref.go b/modules/git/ref.go index 581f3479eba..1b6162eec46 100644 --- a/modules/git/ref.go +++ b/modules/git/ref.go @@ -19,6 +19,8 @@ const ( // PullPrefix is the base directory of the pull information of git. PullPrefix = "refs/pull/" pullSuffix = "/head" + + hiddenRefPrefix = "refs/gitea" ) // IsValidRefPattern ensures that the provided string could be a valid reference @@ -84,6 +86,21 @@ func RefNameFromPullIndex(prIndex int64) RefName { return RefName(PullPrefix + strconv.FormatInt(prIndex, 10) + pullSuffix) } +// MergeRefNameFromPullIndex is the test merge of an open pull request +func MergeRefNameFromPullIndex(prIndex int64) RefName { + return RefName(PullPrefix + strconv.FormatInt(prIndex, 10) + "/merge") +} + +// MergedRefNameFromPullIndex keeps the merged commit after the base branch is deleted or rewritten +func MergedRefNameFromPullIndex(prIndex int64) RefName { + return RefName(hiddenRefPrefix + "/pull/" + strconv.FormatInt(prIndex, 10) + "/merged") +} + +// RunRefNameFromRunID keeps a run's test merge after refs/pull//merge moved on +func RunRefNameFromRunID(runID int64) RefName { + return RefName(hiddenRefPrefix + "/run/" + strconv.FormatInt(runID, 10)) +} + func (ref RefName) String() string { return string(ref) } diff --git a/modules/git/repo_ref.go b/modules/git/repo_ref.go index f355ad4b24f..cb092142094 100644 --- a/modules/git/repo_ref.go +++ b/modules/git/repo_ref.go @@ -141,7 +141,7 @@ func (repo *Repository) GetRefsFiltered(ctx context.Context, pattern string) ([] refName = refName[:len(refName)-1] // refName cannot be HEAD but can be remotes or stash - if strings.HasPrefix(refName, RemotePrefix) || refName == "/refs/stash" { + if strings.HasPrefix(refName, RemotePrefix) || strings.HasPrefix(refName, hiddenRefPrefix+"/") || refName == "/refs/stash" { continue } diff --git a/services/actions/cleanup.go b/services/actions/cleanup.go index da33e155fa6..cd24f0743a9 100644 --- a/services/actions/cleanup.go +++ b/services/actions/cleanup.go @@ -13,6 +13,7 @@ import ( git_model "gitea.dev/models/git" actions_module "gitea.dev/modules/actions" "gitea.dev/modules/container" + "gitea.dev/modules/git" "gitea.dev/modules/log" "gitea.dev/modules/setting" "gitea.dev/modules/storage" @@ -259,6 +260,14 @@ func DeleteRun(ctx context.Context, run *actions_model.ActionRun) error { return err } + if run.TriggerEvent == actions_module.GithubEventPullRequest { + if err := run.LoadRepo(ctx); err != nil { + log.Error("LoadRepo for run %d: %v", run.ID, err) + } else if err := git.RemoveRef(ctx, run.Repo, git.RunRefNameFromRunID(run.ID).String()); err != nil { + log.Error("RemoveRef for run %d: %v", run.ID, err) + } + } + actions_model.UpdateRepoRunsNumbers(ctx, repoID) // Delete files on storage diff --git a/services/actions/cleanup_test.go b/services/actions/cleanup_test.go index 54ab6a30e12..77fa8d3e9a6 100644 --- a/services/actions/cleanup_test.go +++ b/services/actions/cleanup_test.go @@ -14,6 +14,7 @@ import ( repo_model "gitea.dev/models/repo" "gitea.dev/models/unittest" "gitea.dev/modules/container" + "gitea.dev/modules/git" "gitea.dev/modules/optional" "gitea.dev/modules/setting" "gitea.dev/modules/test" @@ -29,7 +30,7 @@ func insertCleanupRun(t *testing.T, index int64, status actions_model.Status, cr run := &actions_model.ActionRun{ Title: "cleanup-run", RepoID: repo.ID, OwnerID: repo.OwnerID, WorkflowID: "test.yaml", Index: index, TriggerUserID: 1, Ref: "refs/heads/main", - CommitSHA: "c2d72f548424103f01ee1dc02889c1e2bff816b0", Event: "push", TriggerEvent: "push", + CommitSHA: "c2d72f548424103f01ee1dc02889c1e2bff816b0", Event: "pull_request", TriggerEvent: "pull_request", Status: status, } require.NoError(t, db.Insert(t.Context(), run)) @@ -68,8 +69,12 @@ func TestCleanupOldRuns(t *testing.T) { oldRunning := insertCleanupRun(t, 2005, actions_model.StatusRunning, old) oldCanceled := insertCleanupRun(t, 2006, actions_model.StatusCancelled, old) oldSkipped := insertCleanupRun(t, 2007, actions_model.StatusSkipped, old) + repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1}) + runRef := git.RunRefNameFromRunID(oldSuccess.ID).String() + require.NoError(t, git.UpdateRef(t.Context(), repo, runRef, "refs/heads/master")) require.NoError(t, CleanupOldRuns(t.Context())) + assert.False(t, git.IsReferenceExist(t.Context(), repo, runRef)) unittest.AssertNotExistsBean(t, &actions_model.ActionRun{ID: oldSuccess.ID}) unittest.AssertNotExistsBean(t, &actions_model.ActionRun{ID: oldFailure.ID}) diff --git a/services/actions/context.go b/services/actions/context.go index 3a4ccbb9381..b6da48a676c 100644 --- a/services/actions/context.go +++ b/services/actions/context.go @@ -47,13 +47,10 @@ func GenerateGiteaContext(ctx context.Context, run *actions_model.ActionRun, att if pullPayload, err := run.GetPullRequestEventPayload(); err == nil && pullPayload.PullRequest != nil && pullPayload.PullRequest.Base != nil && pullPayload.PullRequest.Head != nil { baseRef = pullPayload.PullRequest.Base.Ref headRef = pullPayload.PullRequest.Head.Ref - - // if the TriggerEvent is pull_request_target, ref and sha need to be set according to the base of pull request - // In GitHub's documentation, ref should be the branch or tag that triggered workflow. But when the TriggerEvent is pull_request_target, - // the ref will be the base branch. if run.TriggerEvent == actions_module.GithubEventPullRequestTarget { - ref = git.BranchPrefix + pullPayload.PullRequest.Base.Ref - sha = pullPayload.PullRequest.Base.Sha + ref, sha = git.BranchPrefix+pullPayload.PullRequest.Base.Ref, pullPayload.PullRequest.Base.Sha + } else if run.TriggerEvent == actions_module.GithubEventPullRequest && !pullPayload.PullRequest.HasMerged && pullPayload.PullRequest.MergedCommitID != nil { + ref, sha = git.MergeRefNameFromPullIndex(pullPayload.PullRequest.Index).String(), *pullPayload.PullRequest.MergedCommitID } } diff --git a/services/actions/context_test.go b/services/actions/context_test.go index 92d11b07375..80aaf30187e 100644 --- a/services/actions/context_test.go +++ b/services/actions/context_test.go @@ -420,6 +420,20 @@ func TestGenerateGiteaContext(t *testing.T) { run.TriggerEvent, run.Ref = string(actions_module.GithubEventPullRequest), "refs/pull/1/head" assert.Equal(t, "branch", GenerateGiteaContext(t.Context(), run, nil, nil)["ref_type"]) + payload.PullRequest.Index, payload.PullRequest.MergedCommitID = 1, new("merge-sha") + payloadBytes, err = json.Marshal(payload) + require.NoError(t, err) + run.EventPayload, run.CommitSHA = string(payloadBytes), "head-sha" + giteaCtx = GenerateGiteaContext(t.Context(), run, nil, nil) + assert.Equal(t, "refs/pull/1/merge", giteaCtx["ref"]) + assert.Equal(t, "merge-sha", giteaCtx["sha"]) + + payload.PullRequest.HasMerged = true + payloadBytes, err = json.Marshal(payload) + require.NoError(t, err) + run.EventPayload = string(payloadBytes) + assert.Equal(t, "head-sha", GenerateGiteaContext(t.Context(), run, nil, nil)["sha"]) + defer test.MockVariableValue(&setting.Actions.ArtifactRetentionDays, 7)() assert.Equal(t, "7", GenerateGiteaContext(t.Context(), run, nil, nil)["retention_days"]) setting.Actions.ArtifactRetentionDays = 0 diff --git a/services/actions/notifier_helper.go b/services/actions/notifier_helper.go index 6e5330669a6..ab9c67af81d 100644 --- a/services/actions/notifier_helper.go +++ b/services/actions/notifier_helper.go @@ -29,6 +29,7 @@ import ( "gitea.dev/modules/util" webhook_module "gitea.dev/modules/webhook" "gitea.dev/services/convert" + pull_service "gitea.dev/services/pull" ) type methodCtxKeyType struct{} @@ -71,6 +72,7 @@ type notifyInput struct { PullRequest *issues_model.PullRequest encodedPayload string // cached by EncodedPayload + mergeCommitID string } func newNotifyInput(repo *repo_model.Repository, doer *user_model.User, event webhook_module.HookEventType) *notifyInput { @@ -195,10 +197,23 @@ func notify(ctx context.Context, input *notifyInput) error { return nil } + workflowCommit := commit + var baseCommit *git.Commit + if input.PullRequest != nil { + baseCommit, err = gitRepo.GetCommit(ctx, git.BranchPrefix+input.PullRequest.BaseBranch) + if err != nil { + return fmt.Errorf("gitRepo.GetCommit: %w", err) + } + workflowCommit, err = preparePullRequestMerge(ctx, input, gitRepo, commit, baseCommit) + if err != nil { + return err + } + } + var detectedWorkflows []*actions_module.DetectedWorkflow var filteredWorkflows []*actions_module.DetectedWorkflow actionsConfig := input.Repo.MustGetUnit(ctx, unit_model.TypeActions).ActionsConfig() - workflows, schedules, filtered, invalid, err := actions_module.DetectWorkflows(ctx, gitRepo, commit, + workflows, schedules, filtered, invalid, err := actions_module.DetectWorkflows(ctx, gitRepo, workflowCommit, input.Event, input.Payload, shouldDetectSchedules, @@ -209,7 +224,7 @@ func notify(ctx context.Context, input *notifyInput) error { log.Trace("repo %s with commit %s event %s find %d workflows and %d schedules", input.Repo.FullName(), - commit.ID, + workflowCommit.ID, input.Event, len(workflows), len(schedules), @@ -239,11 +254,6 @@ func notify(ctx context.Context, input *notifyInput) error { if input.PullRequest != nil { // detect pull_request_target workflows - baseRef := git.BranchPrefix + input.PullRequest.BaseBranch - baseCommit, err := gitRepo.GetCommit(ctx, baseRef) - if err != nil { - return fmt.Errorf("gitRepo.GetCommit: %w", err) - } baseWorkflows, _, baseFiltered, _, err := actions_module.DetectWorkflows(ctx, gitRepo, baseCommit, input.Event, input.Payload, false) if err != nil { return fmt.Errorf("DetectWorkflows: %w", err) @@ -291,6 +301,35 @@ func notify(ctx context.Context, input *notifyInput) error { return detectAndHandleScopedWorkflows(ctx, input, ref, gitRepo, commit) } +// preparePullRequestMerge returns the commit to read workflows from, the test merge for open pull requests +func preparePullRequestMerge(ctx context.Context, input *notifyInput, gitRepo *git.Repository, headCommit, baseCommit *git.Commit) (*git.Commit, error) { + payload, ok := input.Payload.(*api.PullRequestPayload) + if !ok || payload.PullRequest == nil || input.PullRequest.Issue.IsClosed || !input.Event.IsPullRequest() { + return headCommit, nil + } + _, entries, err := actions_module.ListWorkflows(ctx, gitRepo, headCommit) + if err == nil && len(entries) == 0 { + _, entries, err = actions_module.ListWorkflows(ctx, gitRepo, baseCommit) + } + if err != nil { + return nil, err + } + if len(entries) == 0 { + if sources, err := actions_model.GetEffectiveScopedWorkflowSources(ctx, input.Repo.OwnerID); err != nil || len(sources) == 0 { + return headCommit, err + } + } + mergeCommitID, err := pull_service.UpdateMergeRef(ctx, input.PullRequest, baseCommit.ID.String(), headCommit.ID.String()) + if err != nil { + log.Error("UpdateMergeRef for %-v: %v", input.PullRequest, err) + } + if mergeCommitID == "" { + return headCommit, nil + } + payload.PullRequest.MergedCommitID, input.mergeCommitID = &mergeCommitID, mergeCommitID + return gitRepo.GetCommit(ctx, mergeCommitID) +} + func skipWorkflows(ctx context.Context, input *notifyInput, commit *git.Commit) bool { // skip workflow runs with a configured skip-ci string in commit message or pr title if the event is push or pull_request(_sync) // https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs @@ -434,6 +473,11 @@ func buildApproveAndInsertRun( } return fmt.Errorf("PrepareRunAndInsert: %w", err) } + if input.mergeCommitID != "" && run.TriggerEvent == actions_module.GithubEventPullRequest { + if err := git.UpdateRef(ctx, input.Repo, git.RunRefNameFromRunID(run.ID).String(), input.mergeCommitID); err != nil { + log.Error("UpdateRef for run %d: %v", run.ID, err) + } + } return nil } diff --git a/services/issue/issue.go b/services/issue/issue.go index 610f9e12828..118214cb5c1 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -175,8 +175,10 @@ func DeleteIssue(ctx context.Context, doer *user_model.User, issue *issues_model if err := issue.PullRequest.LoadBaseRepo(ctx); err != nil { return err } - if err := git.RemoveRef(ctx, issue.PullRequest.BaseRepo, issue.PullRequest.GetGitHeadRefName()); err != nil { - return err + for _, ref := range []git.RefName{git.RefNameFromPullIndex(issue.Index), git.MergeRefNameFromPullIndex(issue.Index), git.MergedRefNameFromPullIndex(issue.Index)} { + if err := git.RemoveRef(ctx, issue.PullRequest.BaseRepo, ref.String()); err != nil { + log.Error("RemoveRef %s: %v", ref, err) + } } } diff --git a/services/pull/merge.go b/services/pull/merge.go index 17690b01b1c..e3a29d6d22b 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -862,6 +862,12 @@ func MarkAsMerged(ctx context.Context, pr *issues_model.PullRequest, mergedCommi } else if !ok { return false, err } + if err := git.UpdateRef(ctx, pr.Issue.Repo, git.MergedRefNameFromPullIndex(pr.Index).String(), pr.MergedCommitID); err != nil { + log.Error("UpdateRef for merged head: %v", err) + } + if err := git.RemoveRef(ctx, pr.Issue.Repo, git.MergeRefNameFromPullIndex(pr.Index).String()); err != nil { + log.Error("RemoveRef for test merge: %v", err) + } err = markAsMergedPostProcess(ctx, pr.ID, merger, wasAutoMerged) if err != nil { diff --git a/services/pull/merge_ref.go b/services/pull/merge_ref.go new file mode 100644 index 00000000000..9745b0f70ed --- /dev/null +++ b/services/pull/merge_ref.go @@ -0,0 +1,72 @@ +// Copyright 2026 The Gitea Authors. All rights reserved. +// SPDX-License-Identifier: MIT + +package pull + +import ( + "context" + "os" + "strings" + + issues_model "gitea.dev/models/issues" + user_model "gitea.dev/models/user" + "gitea.dev/modules/git" + "gitea.dev/modules/git/gitcmd" + "gitea.dev/modules/log" + notify_service "gitea.dev/services/notify" +) + +func init() { + notify_service.RegisterNotifier(&mergeRefNotifier{}) +} + +type mergeRefNotifier struct { + notify_service.NullNotifier +} + +func (*mergeRefNotifier) IssueChangeStatus(ctx context.Context, _doer *user_model.User, _commitID string, issue *issues_model.Issue, _comment *issues_model.Comment, isClosed bool) { + if !issue.IsPull { + return + } + if err := issue.LoadPullRequest(ctx); err != nil { + log.Error("LoadPullRequest: %v", err) + } else if !isClosed { + StartPullRequestCheckImmediately(ctx, issue.PullRequest) + } else if err := git.RemoveRef(ctx, issue.Repo, git.MergeRefNameFromPullIndex(issue.Index).String()); err != nil { + log.Error("RemoveRef: %v", err) + } +} + +// UpdateMergeRef refreshes refs/pull//merge and returns its commit, empty when closed, conflicting or git lacks merge-tree +func UpdateMergeRef(ctx context.Context, pr *issues_model.PullRequest, baseCommitID, headCommitID string) (string, error) { + if !git.DefaultFeatures().SupportGitMergeTree { + return "", nil + } + treeID, conflicted, _, err := git.MergeTree(ctx, pr.BaseRepo, baseCommitID, headCommitID, "") + if err != nil || conflicted { + return "", err + } + return updateMergeRef(ctx, pr, baseCommitID, headCommitID, treeID) +} + +func updateMergeRef(ctx context.Context, pr *issues_model.PullRequest, baseCommitID, headCommitID, treeID string) (string, error) { + if err := pr.LoadIssue(ctx); err != nil || pr.Issue.IsClosed { + return "", err + } + timestamp, _, err := gitcmd.NewCommand("log", "-1", "--no-walk=sorted", "--format=%ct"). + AddDynamicArguments(baseCommitID, headCommitID).WithRepo(pr.BaseRepo).RunStdString(ctx) + if err != nil { + return "", err + } + date := "@" + strings.TrimSpace(timestamp) + " +0000" // the newer parent's date, so equal inputs give the same commit + stdout, _, err := gitcmd.NewCommand("commit-tree", "--no-gpg-sign", "-p").AddDynamicArguments(baseCommitID). + AddArguments("-p").AddDynamicArguments(headCommitID). + AddOptionValues("-m", "Merge "+headCommitID+" into "+baseCommitID). + AddDynamicArguments(treeID).WithRepo(pr.BaseRepo). + WithEnv(append(os.Environ(), "GIT_AUTHOR_DATE="+date, "GIT_COMMITTER_DATE="+date)).RunStdString(ctx) + if err != nil { + return "", err + } + commitID := strings.TrimSpace(stdout) + return commitID, git.UpdateRef(ctx, pr.BaseRepo, git.MergeRefNameFromPullIndex(pr.Index).String(), commitID) +} diff --git a/services/pull/merge_tree.go b/services/pull/merge_tree.go index 0dc64bec943..e6839c29553 100644 --- a/services/pull/merge_tree.go +++ b/services/pull/merge_tree.go @@ -22,6 +22,11 @@ func checkConflictsMergeTree(ctx context.Context, pr *issues_model.PullRequest, if err != nil { return false, fmt.Errorf("MergeTree: %w", err) } + if pr.Index > 0 && !conflict { + if _, err := updateMergeRef(ctx, pr, baseCommitID, pr.HeadCommitID, treeHash); err != nil { + log.Error("updateMergeRef for %-v: %v", pr, err) + } + } if conflict { pr.Status = issues_model.PullRequestStatusConflict // sometimes git merge-tree will detect conflicts but not list any conflicted files diff --git a/services/pull/merge_tree_test.go b/services/pull/merge_tree_test.go index 7b5c47d832e..1593b33930f 100644 --- a/services/pull/merge_tree_test.go +++ b/services/pull/merge_tree_test.go @@ -10,6 +10,7 @@ import ( issues_model "gitea.dev/models/issues" "gitea.dev/models/unittest" + "gitea.dev/modules/git" "gitea.dev/modules/git/gitcmd" "gitea.dev/modules/git/gitrepo" @@ -46,6 +47,21 @@ func TestPullRequestMergeable(t *testing.T) { pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{ID: 2}) t.Run("NoConflict-MergeTree", func(t *testing.T) { testPullRequestMergeCheck(t, checkPullRequestMergeableByMergeTree, pr, issues_model.PullRequestStatusMergeable, nil, nil) + mergeRef := git.MergeRefNameFromPullIndex(pr.Index).String() + mergeCommitID, err := git.GetFullCommitID(t.Context(), pr.BaseRepo, mergeRef) + require.NoError(t, err) + baseCommitID, err := git.GetFullCommitID(t.Context(), pr.BaseRepo, mergeRef+"^1") + require.NoError(t, err) + t.Setenv("GIT_COMMITTER_DATE", "2002-01-01T00:00:00Z") + updatedCommitID, err := UpdateMergeRef(t.Context(), pr, baseCommitID, pr.HeadCommitID) + require.NoError(t, err) + assert.Equal(t, mergeCommitID, updatedCommitID) + + require.NoError(t, git.RemoveRef(t.Context(), pr.BaseRepo, mergeRef)) + pr.Issue.IsClosed = true + testPullRequestMergeCheck(t, checkPullRequestMergeableByMergeTree, pr, issues_model.PullRequestStatusMergeable, nil, nil) + assert.False(t, git.IsReferenceExist(t.Context(), pr.BaseRepo, mergeRef)) + pr.Issue.IsClosed = false }) t.Run("NoConflict-TmpRepo", func(t *testing.T) { testPullRequestMergeCheck(t, checkPullRequestMergeableByTmpRepo, pr, issues_model.PullRequestStatusMergeable, nil, nil) diff --git a/services/pull/pull.go b/services/pull/pull.go index 07c76e03597..04a0a50439c 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -161,6 +161,11 @@ func NewPullRequest(ctx context.Context, opts *NewPullRequestOptions) error { } return err } + if baseCommitID, err := git.GetFullCommitID(ctx, pr.BaseRepo, git.BranchPrefix+pr.BaseBranch); err != nil { + log.Error("GetFullCommitID for %-v: %v", pr, err) + } else if _, err := UpdateMergeRef(ctx, pr, baseCommitID, pr.HeadCommitID); err != nil { + log.Error("UpdateMergeRef for %-v: %v", pr, err) + } issue_service.ReviewRequestNotify(ctx, issue, issue.Poster, reviewNotifiers) diff --git a/tests/integration/actions_job_test.go b/tests/integration/actions_job_test.go index 7a1da909abd..206b9c07927 100644 --- a/tests/integration/actions_job_test.go +++ b/tests/integration/actions_job_test.go @@ -543,8 +543,8 @@ jobs: assert.Equal(t, actionRun.TriggerEvent, gtCtx["event_name"].GetStringValue()) assert.Equal(t, apiPull.Head.Ref, gtCtx["head_ref"].GetStringValue()) assert.Equal(t, actionRunJob.JobID, gtCtx["job"].GetStringValue()) - assert.Equal(t, actionRun.Ref, gtCtx["ref"].GetStringValue()) - assert.Equal(t, git.RefName(actionRun.Ref).ShortName(), gtCtx["ref_name"].GetStringValue()) + assert.Equal(t, git.MergeRefNameFromPullIndex(apiPull.Index).String(), gtCtx["ref"].GetStringValue()) + assert.Equal(t, git.MergeRefNameFromPullIndex(apiPull.Index).ShortName(), gtCtx["ref_name"].GetStringValue()) assert.False(t, gtCtx["ref_protected"].GetBoolValue()) assert.Equal(t, "branch", gtCtx["ref_type"].GetStringValue()) assert.Equal(t, actionRun.Repo.OwnerName+"/"+actionRun.Repo.Name, gtCtx["repository"].GetStringValue()) @@ -555,7 +555,11 @@ jobs: assert.Equal(t, strconv.FormatInt(actionRunJob.Attempt, 10), gtCtx["run_attempt"].GetStringValue()) assert.Equal(t, "Actions", gtCtx["secret_source"].GetStringValue()) assert.Equal(t, setting.AppURL, gtCtx["server_url"].GetStringValue()) - assert.Equal(t, actionRun.CommitSHA, gtCtx["sha"].GetStringValue()) + pullRequest, _ := runEvent["pull_request"].(map[string]any) + assert.Equal(t, pullRequest["merge_commit_sha"], gtCtx["sha"].GetStringValue()) + retainedCommitID, err := git.GetFullCommitID(t.Context(), actionRun.Repo, git.RunRefNameFromRunID(actionRun.ID).String()) + require.NoError(t, err) + assert.Equal(t, retainedCommitID, gtCtx["sha"].GetStringValue()) assert.Equal(t, actionRun.WorkflowID, gtCtx["workflow"].GetStringValue()) assert.Equal(t, setting.Actions.DefaultActionsURL.URL(), gtCtx["gitea_default_actions_url"].GetStringValue()) token := gtCtx["token"].GetStringValue() diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index 72397ceb101..85f04ddb0c6 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -1123,6 +1123,7 @@ jobs: // closed err = issue_service.CloseIssue(t.Context(), pullIssue, user2, "") assert.NoError(t, err) + assert.False(t, git.IsReferenceExist(t.Context(), repo, git.MergeRefNameFromPullIndex(pullRequest.Index).String())) checkCommitStatusAndInsertFakeStatus(t, repo, sha) // reopened @@ -1190,6 +1191,10 @@ jobs: assert.NotEmpty(t, addFileResp) sha = addFileResp.Commit.SHA waitCommitStatusAndInsertFakeStatus(t, repo, sha) + mergeCommitSHA := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: repo.ID, Event: webhook_module.HookEventPullRequestSync}).WorkflowCommitSHA + parents, _, err := gitcmd.NewCommand("rev-parse").AddDynamicArguments(mergeCommitSHA+"^1", mergeCommitSHA+"^2").WithRepo(repo).RunStdString(t.Context()) + require.NoError(t, err) + assert.Equal(t, addWorkflow.Commit.SHA+"\n"+sha+"\n", parents) // milestoned milestone := &issues_model.Milestone{ @@ -1772,6 +1777,10 @@ jobs: actionRun := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{RepoID: baseRepo.ID}) assert.Equal(t, actions_module.GithubEventPullRequest, actionRun.TriggerEvent) assert.Equal(t, pullRequest.MergedCommitID, actionRun.CommitSHA) + mergedCommitID, err := git.GetFullCommitID(t.Context(), baseRepo, git.MergedRefNameFromPullIndex(pullRequest.Index).String()) + require.NoError(t, err) + assert.Equal(t, pullRequest.MergedCommitID, mergedCommitID) + assert.False(t, git.IsReferenceExist(t.Context(), baseRepo, git.MergeRefNameFromPullIndex(pullRequest.Index).String())) }) } @@ -1806,14 +1815,18 @@ jobs: // create a PR to modify "dir1/dir1.txt", the workflow will be triggered testEditFileToNewBranch(t, session, "user2", repoName, repo.DefaultBranch, "update-dir1", "dir1/dir1.txt", "11") + testEditFileToNewBranch(t, session, "user2", repoName, repo.DefaultBranch, "update-dir2", "dir2/dir2.txt", "22") + wfFileContent = strings.ReplaceAll(wfFileContent, "echo 'ci'", "echo 'base workflow'") + wfFileContent = strings.ReplaceAll(wfFileContent, " - 'dir1/**'", " - 'dir1/**'\n - '.gitea/workflows/**'") + testEditFile(t, session, "user2", repoName, repo.DefaultBranch, ".gitea/workflows/ci.yml", wfFileContent) _, err := doAPICreatePullRequest(apiCtx, "user2", repoName, repo.DefaultBranch, "update-dir1")(t) assert.NoError(t, err) pr1Task := runner.fetchTask(t) _, _, pr1Run := getTaskAndJobAndRunByTaskID(t, pr1Task.Id) assert.Equal(t, webhook_module.HookEventPullRequest, pr1Run.Event) + assert.Contains(t, string(pr1Task.WorkflowPayload), "echo 'base workflow'") // create a PR to modify "dir2/dir2.txt" then update main branch and rebase, the workflow will not be triggered - testEditFileToNewBranch(t, session, "user2", repoName, repo.DefaultBranch, "update-dir2", "dir2/dir2.txt", "22") apiPull, err := doAPICreatePullRequest(apiCtx, "user2", repoName, repo.DefaultBranch, "update-dir2")(t) runner.fetchNoTask(t) assert.NoError(t, err)