mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-12 22:10:25 +00:00
feat: show workflow name for scheduled runs (#11770)
Previously, a scheduled run would appear like a run triggered by a push. That could be confusing, especially if a scheduled run was unrelated to that particular commit. Now, either the workflow's name (taken from the field `name:`) is displayed or the path to workflow file, matching the behaviour of `workflow_dispatch`. As a side-effect, the description of all run types were improved. They are no longer pieced together from individual translations. `workflow_dispatch` also no longer misattributes commits to the user that triggered the workflow. Resolves https://codeberg.org/forgejo/forgejo/issues/11688. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests for Go changes (can be removed for JavaScript changes) - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. - [x] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I ran... - [x] `make pr-go` before pushing ### Tests for JavaScript changes (can be removed for Go changes) - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [x] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [ ] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. *The decision if the pull request will be shown in the release notes is up to the mergers / release team.* The content of the `release-notes/<pull request number>.md` file will serve as the basis for the release notes. If the file does not exist, the title of the pull request will be used instead. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11770 Reviewed-by: Mathieu Fenniak <mfenniak@noreply.codeberg.org> Co-authored-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch> Co-committed-by: Andreas Ahlenstorf <andreas@ahlenstorf.ch>
This commit is contained in:
parent
5b83cb5508
commit
b01278e534
17 changed files with 407 additions and 52 deletions
|
|
@ -104,6 +104,13 @@ func (run *ActionRun) Link() string {
|
|||
return fmt.Sprintf("%s/actions/runs/%d", run.Repo.Link(), run.Index)
|
||||
}
|
||||
|
||||
func (run *ActionRun) CommitLink() string {
|
||||
if run.Repo == nil {
|
||||
return ""
|
||||
}
|
||||
return fmt.Sprintf("%s/commit/%s", run.Repo.Link(), run.CommitSHA)
|
||||
}
|
||||
|
||||
// WorkflowPath returns the path in the git repo to the workflow file that this run was based on
|
||||
func (run *ActionRun) WorkflowPath() string {
|
||||
if run.WorkflowDirectory == "" {
|
||||
|
|
@ -240,6 +247,14 @@ func (run *ActionRun) FindOuterWorkflowCall(ctx context.Context, innerCall *Acti
|
|||
return nil, fmt.Errorf("no workflow call with ID %s found in run %d", parent, run.ID)
|
||||
}
|
||||
|
||||
func (run *ActionRun) IsScheduledRun() bool {
|
||||
return run.TriggerEvent == "schedule"
|
||||
}
|
||||
|
||||
func (run *ActionRun) IsDispatchedRun() bool {
|
||||
return run.TriggerEvent == "workflow_dispatch"
|
||||
}
|
||||
|
||||
func actionsCountOpenCacheKey(repoID int64) string {
|
||||
return fmt.Sprintf("Actions:CountOpenActionRuns:%d", repoID)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ import (
|
|||
repo_model "forgejo.org/models/repo"
|
||||
"forgejo.org/models/unittest"
|
||||
"forgejo.org/modules/cache"
|
||||
"forgejo.org/modules/setting"
|
||||
"forgejo.org/modules/test"
|
||||
|
||||
"code.forgejo.org/forgejo/runner/v12/act/jobparser"
|
||||
"github.com/stretchr/testify/assert"
|
||||
|
|
@ -53,6 +55,47 @@ func TestGetWorkflowPath(t *testing.T) {
|
|||
assert.Equal(t, ".some/path/to/workflows/ci.yml", run.WorkflowPath())
|
||||
}
|
||||
|
||||
func TestGetCommitLink(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
defer test.MockVariableValue(&setting.AppSubURL, "/sub")()
|
||||
|
||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
||||
|
||||
run := ActionRun{
|
||||
Repo: repo,
|
||||
CommitSHA: "a356d1f1f82945a039cd16d4ce0137bd55284e77",
|
||||
}
|
||||
assert.Equal(t, "/sub/user2/repo1/commit/a356d1f1f82945a039cd16d4ce0137bd55284e77", run.CommitLink())
|
||||
}
|
||||
|
||||
func TestIsScheduledRun(t *testing.T) {
|
||||
scheduledRun := ActionRun{
|
||||
CommitSHA: "a356d1f1f82945a039cd16d4ce0137bd55284e77",
|
||||
TriggerEvent: "schedule",
|
||||
}
|
||||
pushRun := ActionRun{
|
||||
CommitSHA: "8f9b5c6ab342eb11d7422deecef7195b18058b90",
|
||||
TriggerEvent: "push",
|
||||
}
|
||||
|
||||
assert.True(t, scheduledRun.IsScheduledRun())
|
||||
assert.False(t, pushRun.IsScheduledRun())
|
||||
}
|
||||
|
||||
func TestIsManualRun(t *testing.T) {
|
||||
manualRunRun := ActionRun{
|
||||
CommitSHA: "a356d1f1f82945a039cd16d4ce0137bd55284e77",
|
||||
TriggerEvent: "workflow_dispatch",
|
||||
}
|
||||
pushRun := ActionRun{
|
||||
CommitSHA: "8f9b5c6ab342eb11d7422deecef7195b18058b90",
|
||||
TriggerEvent: "push",
|
||||
}
|
||||
|
||||
assert.True(t, manualRunRun.IsDispatchedRun())
|
||||
assert.False(t, pushRun.IsDispatchedRun())
|
||||
}
|
||||
|
||||
func TestRepoNumOpenActions(t *testing.T) {
|
||||
require.NoError(t, unittest.PrepareTestDatabase())
|
||||
err := cache.Init()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue