nordic-dev.net/gitea
nordic-dev.net/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-05-14 02:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix error handling and revert changes to test files

Browse Source
This commit is contained in:
badhezi 2025-04-30 09:55:06 +03:00
parent 53d9753f9d
commit 318bf1c484
2 changed files with 60 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
services/actions/notifier_helper.go
View File

@ -318,9 +318,6 @@ func handleWorkflows(
if runName, err := parseRunName(run, dwf); err == nil {
run.Title = runName
} else {
log.Error("evaluateExpressionsForRun: %v", err)
continue
}
need, err := ifNeedApproval(ctx, run, input.Repo, input.Doer)
@ -532,8 +529,6 @@ func handleSchedules(
if runName, err := parseRunName(run.ToActionRun(), dwf); err == nil {
run.Title = runName
} else {
log.Error("ParseRunName: %v", err)
}
crons = append(crons, run)
@ -591,7 +586,11 @@ func parseRunName(r *actions_model.ActionRun, w *actions_module.DetectedWorkflow
return "", err
}
title, _ := jobparser.ParseRunName(w.Content, jobparser.WithGitContext(ghCtx))
log.Info("title: %s", title)
title, err := jobparser.ParseRunName(w.Content, jobparser.WithGitContext(ghCtx))
if err != nil {
// stay silent, run-name was not provided.
return "", err
}
return title, nil
}

135
tests/integration/actions_trigger_test.go
View File

@ -414,15 +414,12 @@ jobs:
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,
Repo: repo,
Event: "create",
Ref: "refs/heads/test-create-branch",
WorkflowID: "createdelete.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "create",
Ref: "refs/heads/test-create-branch",
WorkflowID: "createdelete.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
@ -430,15 +427,12 @@ jobs:
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,
Repo: repo,
Event: "create",
Ref: "refs/tags/test-create-tag",
WorkflowID: "createdelete.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "create",
Ref: "refs/tags/test-create-tag",
WorkflowID: "createdelete.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
@ -446,15 +440,12 @@ jobs:
err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch", nil)
assert.NoError(t, err)
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "add workflow",
RepoID: repo.ID,
Repo: repo,
Event: "delete",
Ref: "refs/heads/main",
WorkflowID: "createdelete.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "delete",
Ref: "refs/heads/main",
WorkflowID: "createdelete.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
@ -464,15 +455,12 @@ jobs:
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,
Repo: repo,
Event: "delete",
Ref: "refs/heads/main",
WorkflowID: "createdelete.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "delete",
Ref: "refs/heads/main",
WorkflowID: "createdelete.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
})
@ -774,15 +762,12 @@ jobs:
_ = MakeRequest(t, req, http.StatusNoContent)
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "add workflow",
RepoID: repo.ID,
Repo: repo,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
})
@ -859,15 +844,12 @@ jobs:
_ = MakeRequest(t, req, http.StatusNoContent)
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "add workflow",
RepoID: repo.ID,
Repo: repo,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
dispatchPayload := &api.WorkflowDispatchPayload{}
@ -957,15 +939,12 @@ jobs:
_ = MakeRequest(t, req, http.StatusNoContent)
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "add workflow",
RepoID: repo.ID,
Repo: repo,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
})
@ -1045,15 +1024,12 @@ jobs:
_ = MakeRequest(t, req, http.StatusNoContent)
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "add workflow",
RepoID: repo.ID,
Repo: repo,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
dispatchPayload := &api.WorkflowDispatchPayload{}
@ -1376,15 +1352,12 @@ jobs:
_ = MakeRequest(t, req, http.StatusNoContent)
run := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
Title: "add workflow",
RepoID: repo.ID,
Repo: repo,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
TriggerUserID: user2.ID,
TriggerUser: user2,
Title: "add workflow",
RepoID: repo.ID,
Event: "workflow_dispatch",
Ref: "refs/heads/main",
WorkflowID: "dispatch.yml",
CommitSHA: branch.CommitID,
})
assert.NotNil(t, run)
dispatchPayload := &api.WorkflowDispatchPayload{}