tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-26 15:25:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix naming of htmlurl

Browse Source
This commit is contained in:
Christopher Homberger 2025-02-25 12:36:11 +01:00
parent 1684975d75
commit da2180e029
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/structs/repo_actions.go
View File

@ -113,7 +113,7 @@ type ActionWorkflowStep struct {
type ActionWorkflowJob struct { type ActionWorkflowJob struct {
ID int64 `json:"id"` ID int64 `json:"id"`
URL string `json:"url"` URL string `json:"url"`
HtmlURL string `json:"html_url"` HTMLURL string `json:"html_url"`
RunID int64 `json:"run_id"` RunID int64 `json:"run_id"`
RunURL string `json:"run_url"` RunURL string `json:"run_url"`
Name string `json:"name"` Name string `json:"name"`

2
services/webhook/notifier.go
View File

@ -1004,7 +1004,7 @@ func (*webhookNotifier) WorkflowJobStatusUpdate(ctx context.Context, repo *repo_
ID: job.ID, ID: job.ID,
// missing api endpoint for this location // missing api endpoint for this location
URL: fmt.Sprintf("%s/actions/runs/%d/jobs/%d", repo.APIURL(), job.RunID, job.ID), URL: fmt.Sprintf("%s/actions/runs/%d/jobs/%d", repo.APIURL(), job.RunID, job.ID),
HtmlURL: fmt.Sprintf("%s/jobs/%d", job.Run.HTMLURL(), jobIndex), HTMLURL: fmt.Sprintf("%s/jobs/%d", job.Run.HTMLURL(), jobIndex),
RunID: job.RunID, RunID: job.RunID,
// Missing api endpoint for this location, artifacts are available under a nested url // Missing api endpoint for this location, artifacts are available under a nested url
RunURL: fmt.Sprintf("%s/actions/runs/%d", repo.APIURL(), job.RunID), RunURL: fmt.Sprintf("%s/actions/runs/%d", repo.APIURL(), job.RunID),

4
tests/integration/repo_webhook_test.go
View File

@ -704,7 +704,7 @@ jobs:
assert.EqualValues(t, "user2/repo1", payloads[3].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[3].Repository.FullName)
assert.Contains(t, payloads[3].WorkflowJob.URL, fmt.Sprintf("/actions/runs/%d/jobs/%d", payloads[3].WorkflowJob.RunID, payloads[3].WorkflowJob.ID)) assert.Contains(t, payloads[3].WorkflowJob.URL, fmt.Sprintf("/actions/runs/%d/jobs/%d", payloads[3].WorkflowJob.RunID, payloads[3].WorkflowJob.ID))
assert.Contains(t, payloads[3].WorkflowJob.URL, payloads[3].WorkflowJob.RunURL) assert.Contains(t, payloads[3].WorkflowJob.URL, payloads[3].WorkflowJob.RunURL)
assert.Contains(t, payloads[3].WorkflowJob.HtmlURL, fmt.Sprintf("/jobs/%d", 0)) assert.Contains(t, payloads[3].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 0))
assert.Len(t, payloads[3].WorkflowJob.Steps, 1) assert.Len(t, payloads[3].WorkflowJob.Steps, 1)
assert.EqualValues(t, "queued", payloads[4].Action) assert.EqualValues(t, "queued", payloads[4].Action)
@ -742,7 +742,7 @@ jobs:
assert.EqualValues(t, "user2/repo1", payloads[6].Repository.FullName) assert.EqualValues(t, "user2/repo1", payloads[6].Repository.FullName)
assert.Contains(t, payloads[6].WorkflowJob.URL, fmt.Sprintf("/actions/runs/%d/jobs/%d", payloads[6].WorkflowJob.RunID, payloads[6].WorkflowJob.ID)) assert.Contains(t, payloads[6].WorkflowJob.URL, fmt.Sprintf("/actions/runs/%d/jobs/%d", payloads[6].WorkflowJob.RunID, payloads[6].WorkflowJob.ID))
assert.Contains(t, payloads[6].WorkflowJob.URL, payloads[6].WorkflowJob.RunURL) assert.Contains(t, payloads[6].WorkflowJob.URL, payloads[6].WorkflowJob.RunURL)
assert.Contains(t, payloads[6].WorkflowJob.HtmlURL, fmt.Sprintf("/jobs/%d", 1)) assert.Contains(t, payloads[6].WorkflowJob.HTMLURL, fmt.Sprintf("/jobs/%d", 1))
assert.Len(t, payloads[6].WorkflowJob.Steps, 2) assert.Len(t, payloads[6].WorkflowJob.Steps, 2)
}) })
} }