Fix invalid link of the commit status when ref is tag (#29752)
Fix #29731 Caused by #24634 Also remove fixme. ps: we can not fix the existed runs, as wrong refs are all recorded in DB, and we can not know whether they are branch or tag:  (cherry picked from commit 98217b034076157547cf688cc10f47cd3275c872) Conflicts: tests/integration/actions_trigger_test.go there is a need for more imports because the exist tests are done differently, using CreateDeclarativeRepo
This commit is contained in:
		
					parent
					
						
							
								0da787f237
							
						
					
				
			
			
				commit
				
					
						e8e8d14b53
					
				
			
		
					 2 changed files with 134 additions and 3 deletions
				
			
		| 
						 | 
					@ -515,6 +515,12 @@ func (*actionsNotifier) MergePullRequest(ctx context.Context, doer *user_model.U
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (n *actionsNotifier) PushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
 | 
					func (n *actionsNotifier) PushCommits(ctx context.Context, pusher *user_model.User, repo *repo_model.Repository, opts *repository.PushUpdateOptions, commits *repository.PushCommits) {
 | 
				
			||||||
 | 
						commitID, _ := git.NewIDFromString(opts.NewCommitID)
 | 
				
			||||||
 | 
						if commitID.IsZero() {
 | 
				
			||||||
 | 
							log.Trace("new commitID is empty")
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	ctx = withMethod(ctx, "PushCommits")
 | 
						ctx = withMethod(ctx, "PushCommits")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	apiPusher := convert.ToUser(ctx, pusher, nil)
 | 
						apiPusher := convert.ToUser(ctx, pusher, nil)
 | 
				
			||||||
| 
						 | 
					@ -547,9 +553,9 @@ func (n *actionsNotifier) CreateRef(ctx context.Context, pusher *user_model.User
 | 
				
			||||||
	apiRepo := convert.ToRepo(ctx, repo, access_model.Permission{AccessMode: perm_model.AccessModeNone})
 | 
						apiRepo := convert.ToRepo(ctx, repo, access_model.Permission{AccessMode: perm_model.AccessModeNone})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	newNotifyInput(repo, pusher, webhook_module.HookEventCreate).
 | 
						newNotifyInput(repo, pusher, webhook_module.HookEventCreate).
 | 
				
			||||||
		WithRef(refFullName.ShortName()). // FIXME: should we use a full ref name
 | 
							WithRef(refFullName.String()).
 | 
				
			||||||
		WithPayload(&api.CreatePayload{
 | 
							WithPayload(&api.CreatePayload{
 | 
				
			||||||
			Ref:     refFullName.ShortName(),
 | 
								Ref:     refFullName.String(),
 | 
				
			||||||
			Sha:     refID,
 | 
								Sha:     refID,
 | 
				
			||||||
			RefType: refFullName.RefType(),
 | 
								RefType: refFullName.RefType(),
 | 
				
			||||||
			Repo:    apiRepo,
 | 
								Repo:    apiRepo,
 | 
				
			||||||
| 
						 | 
					@ -566,7 +572,7 @@ func (n *actionsNotifier) DeleteRef(ctx context.Context, pusher *user_model.User
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	newNotifyInput(repo, pusher, webhook_module.HookEventDelete).
 | 
						newNotifyInput(repo, pusher, webhook_module.HookEventDelete).
 | 
				
			||||||
		WithPayload(&api.DeletePayload{
 | 
							WithPayload(&api.DeletePayload{
 | 
				
			||||||
			Ref:        refFullName.ShortName(),
 | 
								Ref:        refFullName.String(),
 | 
				
			||||||
			RefType:    refFullName.RefType(),
 | 
								RefType:    refFullName.RefType(),
 | 
				
			||||||
			PusherType: api.PusherTypeUser,
 | 
								PusherType: api.PusherTypeUser,
 | 
				
			||||||
			Repo:       apiRepo,
 | 
								Repo:       apiRepo,
 | 
				
			||||||
| 
						 | 
					@ -623,6 +629,10 @@ func (n *actionsNotifier) UpdateRelease(ctx context.Context, doer *user_model.Us
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func (n *actionsNotifier) DeleteRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) {
 | 
					func (n *actionsNotifier) DeleteRelease(ctx context.Context, doer *user_model.User, rel *repo_model.Release) {
 | 
				
			||||||
 | 
						if rel.IsTag {
 | 
				
			||||||
 | 
							// has sent same action in `PushCommits`, so skip it.
 | 
				
			||||||
 | 
							return
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
	ctx = withMethod(ctx, "DeleteRelease")
 | 
						ctx = withMethod(ctx, "DeleteRelease")
 | 
				
			||||||
	notifyRelease(ctx, doer, rel, api.HookReleaseDeleted)
 | 
						notifyRelease(ctx, doer, rel, api.HookReleaseDeleted)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,17 +11,22 @@ import (
 | 
				
			||||||
	"time"
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	actions_model "code.gitea.io/gitea/models/actions"
 | 
						actions_model "code.gitea.io/gitea/models/actions"
 | 
				
			||||||
 | 
						"code.gitea.io/gitea/models/db"
 | 
				
			||||||
 | 
						git_model "code.gitea.io/gitea/models/git"
 | 
				
			||||||
	issues_model "code.gitea.io/gitea/models/issues"
 | 
						issues_model "code.gitea.io/gitea/models/issues"
 | 
				
			||||||
 | 
						repo_model "code.gitea.io/gitea/models/repo"
 | 
				
			||||||
	unit_model "code.gitea.io/gitea/models/unit"
 | 
						unit_model "code.gitea.io/gitea/models/unit"
 | 
				
			||||||
	"code.gitea.io/gitea/models/unittest"
 | 
						"code.gitea.io/gitea/models/unittest"
 | 
				
			||||||
	user_model "code.gitea.io/gitea/models/user"
 | 
						user_model "code.gitea.io/gitea/models/user"
 | 
				
			||||||
	actions_module "code.gitea.io/gitea/modules/actions"
 | 
						actions_module "code.gitea.io/gitea/modules/actions"
 | 
				
			||||||
	"code.gitea.io/gitea/modules/git"
 | 
						"code.gitea.io/gitea/modules/git"
 | 
				
			||||||
 | 
						"code.gitea.io/gitea/modules/gitrepo"
 | 
				
			||||||
	"code.gitea.io/gitea/modules/setting"
 | 
						"code.gitea.io/gitea/modules/setting"
 | 
				
			||||||
	"code.gitea.io/gitea/modules/test"
 | 
						"code.gitea.io/gitea/modules/test"
 | 
				
			||||||
	webhook_module "code.gitea.io/gitea/modules/webhook"
 | 
						webhook_module "code.gitea.io/gitea/modules/webhook"
 | 
				
			||||||
	actions_service "code.gitea.io/gitea/services/actions"
 | 
						actions_service "code.gitea.io/gitea/services/actions"
 | 
				
			||||||
	pull_service "code.gitea.io/gitea/services/pull"
 | 
						pull_service "code.gitea.io/gitea/services/pull"
 | 
				
			||||||
 | 
						release_service "code.gitea.io/gitea/services/release"
 | 
				
			||||||
	repo_service "code.gitea.io/gitea/services/repository"
 | 
						repo_service "code.gitea.io/gitea/services/repository"
 | 
				
			||||||
	files_service "code.gitea.io/gitea/services/repository/files"
 | 
						files_service "code.gitea.io/gitea/services/repository/files"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -275,3 +280,119 @@ func TestSkipCI(t *testing.T) {
 | 
				
			||||||
		assert.Equal(t, 1, unittest.GetCount(t, &actions_model.ActionRun{RepoID: repo.ID}))
 | 
							assert.Equal(t, 1, unittest.GetCount(t, &actions_model.ActionRun{RepoID: repo.ID}))
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					func TestCreateDeleteRefEvent(t *testing.T) {
 | 
				
			||||||
 | 
						onGiteaRun(t, func(t *testing.T, u *url.URL) {
 | 
				
			||||||
 | 
							user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// create the repo
 | 
				
			||||||
 | 
							repo, err := repo_service.CreateRepository(db.DefaultContext, user2, user2, repo_service.CreateRepoOptions{
 | 
				
			||||||
 | 
								Name:          "create-delete-ref-event",
 | 
				
			||||||
 | 
								Description:   "test create delete ref ci event",
 | 
				
			||||||
 | 
								AutoInit:      true,
 | 
				
			||||||
 | 
								Gitignores:    "Go",
 | 
				
			||||||
 | 
								License:       "MIT",
 | 
				
			||||||
 | 
								Readme:        "Default",
 | 
				
			||||||
 | 
								DefaultBranch: "main",
 | 
				
			||||||
 | 
								IsPrivate:     false,
 | 
				
			||||||
 | 
							})
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
							assert.NotEmpty(t, repo)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// enable actions
 | 
				
			||||||
 | 
							err = repo_service.UpdateRepositoryUnits(db.DefaultContext, repo, []repo_model.RepoUnit{{
 | 
				
			||||||
 | 
								RepoID: repo.ID,
 | 
				
			||||||
 | 
								Type:   unit_model.TypeActions,
 | 
				
			||||||
 | 
							}}, nil)
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// add workflow file to the repo
 | 
				
			||||||
 | 
							addWorkflowToBaseResp, err := files_service.ChangeRepoFiles(git.DefaultContext, repo, user2, &files_service.ChangeRepoFilesOptions{
 | 
				
			||||||
 | 
								Files: []*files_service.ChangeRepoFile{
 | 
				
			||||||
 | 
									{
 | 
				
			||||||
 | 
										Operation:     "create",
 | 
				
			||||||
 | 
										TreePath:      ".gitea/workflows/createdelete.yml",
 | 
				
			||||||
 | 
										ContentReader: strings.NewReader("name: test\non:\n  [create,delete]\njobs:\n  test:\n    runs-on: ubuntu-latest\n    steps:\n      - run: echo helloworld\n"),
 | 
				
			||||||
 | 
									},
 | 
				
			||||||
 | 
								},
 | 
				
			||||||
 | 
								Message:   "add workflow",
 | 
				
			||||||
 | 
								OldBranch: "main",
 | 
				
			||||||
 | 
								NewBranch: "main",
 | 
				
			||||||
 | 
								Author: &files_service.IdentityOptions{
 | 
				
			||||||
 | 
									Name:  user2.Name,
 | 
				
			||||||
 | 
									Email: user2.Email,
 | 
				
			||||||
 | 
								},
 | 
				
			||||||
 | 
								Committer: &files_service.IdentityOptions{
 | 
				
			||||||
 | 
									Name:  user2.Name,
 | 
				
			||||||
 | 
									Email: user2.Email,
 | 
				
			||||||
 | 
								},
 | 
				
			||||||
 | 
								Dates: &files_service.CommitDateOptions{
 | 
				
			||||||
 | 
									Author:    time.Now(),
 | 
				
			||||||
 | 
									Committer: time.Now(),
 | 
				
			||||||
 | 
								},
 | 
				
			||||||
 | 
							})
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
							assert.NotEmpty(t, addWorkflowToBaseResp)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// Get the commit ID of the default branch
 | 
				
			||||||
 | 
							gitRepo, err := gitrepo.OpenRepository(git.DefaultContext, repo)
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
							defer gitRepo.Close()
 | 
				
			||||||
 | 
							branch, err := git_model.GetBranch(db.DefaultContext, repo.ID, repo.DefaultBranch)
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// create a branch
 | 
				
			||||||
 | 
							err = repo_service.CreateNewBranchFromCommit(db.DefaultContext, user2, repo, gitRepo, branch.CommitID, "test-create-branch")
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
							run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
 | 
				
			||||||
 | 
								Title:      "add workflow",
 | 
				
			||||||
 | 
								RepoID:     repo.ID,
 | 
				
			||||||
 | 
								Event:      "create",
 | 
				
			||||||
 | 
								Ref:        "refs/heads/test-create-branch",
 | 
				
			||||||
 | 
								WorkflowID: "createdelete.yml",
 | 
				
			||||||
 | 
								CommitSHA:  branch.CommitID,
 | 
				
			||||||
 | 
							})
 | 
				
			||||||
 | 
							assert.NotNil(t, run)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// create a tag
 | 
				
			||||||
 | 
							err = release_service.CreateNewTag(db.DefaultContext, user2, repo, branch.CommitID, "test-create-tag", "test create tag event")
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
							run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
 | 
				
			||||||
 | 
								Title:      "add workflow",
 | 
				
			||||||
 | 
								RepoID:     repo.ID,
 | 
				
			||||||
 | 
								Event:      "create",
 | 
				
			||||||
 | 
								Ref:        "refs/tags/test-create-tag",
 | 
				
			||||||
 | 
								WorkflowID: "createdelete.yml",
 | 
				
			||||||
 | 
								CommitSHA:  branch.CommitID,
 | 
				
			||||||
 | 
							})
 | 
				
			||||||
 | 
							assert.NotNil(t, run)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// delete the branch
 | 
				
			||||||
 | 
							err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch")
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
							run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
 | 
				
			||||||
 | 
								Title:      "add workflow",
 | 
				
			||||||
 | 
								RepoID:     repo.ID,
 | 
				
			||||||
 | 
								Event:      "delete",
 | 
				
			||||||
 | 
								Ref:        "main",
 | 
				
			||||||
 | 
								WorkflowID: "createdelete.yml",
 | 
				
			||||||
 | 
								CommitSHA:  branch.CommitID,
 | 
				
			||||||
 | 
							})
 | 
				
			||||||
 | 
							assert.NotNil(t, run)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							// delete the tag
 | 
				
			||||||
 | 
							tag, err := repo_model.GetRelease(db.DefaultContext, repo.ID, "test-create-tag")
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
							err = release_service.DeleteReleaseByID(db.DefaultContext, repo, tag, user2, true)
 | 
				
			||||||
 | 
							assert.NoError(t, err)
 | 
				
			||||||
 | 
							run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
 | 
				
			||||||
 | 
								Title:      "add workflow",
 | 
				
			||||||
 | 
								RepoID:     repo.ID,
 | 
				
			||||||
 | 
								Event:      "delete",
 | 
				
			||||||
 | 
								Ref:        "main",
 | 
				
			||||||
 | 
								WorkflowID: "createdelete.yml",
 | 
				
			||||||
 | 
								CommitSHA:  branch.CommitID,
 | 
				
			||||||
 | 
							})
 | 
				
			||||||
 | 
							assert.NotNil(t, run)
 | 
				
			||||||
 | 
						})
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue