diff --git a/routers/web/repo/actions/view.go b/routers/web/repo/actions/view.go
index d56d993ae5..985f74f560 100644
--- a/routers/web/repo/actions/view.go
+++ b/routers/web/repo/actions/view.go
@@ -591,6 +591,7 @@ func rerunJob(ctx *context_module.Context, job *actions_model.ActionRunJob, shou
func Logs(ctx *context_module.Context) {
runIndex := ctx.ParamsInt64("run")
jobIndex := ctx.ParamsInt64("job")
+ attemptNumber := ctx.ParamsInt64("attempt")
job, _ := getRunJobs(ctx, runIndex, jobIndex)
if ctx.Written() {
@@ -607,7 +608,7 @@ func Logs(ctx *context_module.Context) {
return
}
- task, err := actions_model.GetTaskByID(ctx, job.TaskID)
+ task, err := actions_model.GetTaskByJobAttempt(ctx, job.ID, attemptNumber)
if err != nil {
ctx.Error(http.StatusInternalServerError, err.Error())
return
diff --git a/routers/web/web.go b/routers/web/web.go
index be0c936ef3..a7cc105683 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1456,10 +1456,12 @@ func registerRoutes(m *web.Route) {
Get(actions.RedirectToLatestAttempt).
Post(web.Bind(actions.ViewRequest{}), actions.ViewPost)
m.Post("/rerun", reqRepoActionsWriter, actions.Rerun)
- m.Get("/logs", actions.Logs)
- m.Combo("/attempt/{attempt}").
- Get(actions.View).
- Post(web.Bind(actions.ViewRequest{}), actions.ViewPost)
+ m.Group("/attempt/{attempt}", func() {
+ m.Combo("").
+ Get(actions.View).
+ Post(web.Bind(actions.ViewRequest{}), actions.ViewPost)
+ m.Get("/logs", actions.Logs)
+ })
})
m.Post("/cancel", reqRepoActionsWriter, actions.Cancel)
m.Get("/artifacts", actions.ArtifactsView)
diff --git a/tests/integration/actions_log_test.go b/tests/integration/actions_log_test.go
index 85c590f9b4..14cf74d00c 100644
--- a/tests/integration/actions_log_test.go
+++ b/tests/integration/actions_log_test.go
@@ -140,8 +140,10 @@ jobs:
// download task logs and check content
runIndex := task.Context.GetFields()["run_number"].GetStringValue()
- req := NewRequest(t, "GET", fmt.Sprintf("/%s/%s/actions/runs/%s/jobs/0/logs", user2.Name, repo.Name, runIndex)).
- AddTokenAuth(token)
+ attempt := task.Context.GetFields()["run_attempt"].GetStringValue()
+ logURL := fmt.Sprintf("/%s/%s/actions/runs/%s/jobs/0/attempt/%s/logs", user2.Name, repo.Name, runIndex, attempt)
+ req := NewRequest(t, "GET", logURL)
+ req.AddTokenAuth(token)
resp := MakeRequest(t, req, http.StatusOK)
logTextLines := strings.Split(strings.TrimSpace(resp.Body.String()), "\n")
assert.Len(t, logTextLines, len(tc.outcome.logRows))
@@ -161,3 +163,119 @@ jobs:
doAPIDeleteRepository(httpContext)(t)
})
}
+
+func TestActionsDownloadTaskRerunLogs(t *testing.T) {
+ if !setting.Database.Type.IsSQLite3() {
+ t.Skip()
+ }
+ now := time.Now()
+ treePath := ".gitea/workflows/download-task-logs.yml"
+ fileContent := `name: download-task-logs
+on:
+ push:
+ paths:
+ - '.gitea/workflows/download-task-logs.yml'
+jobs:
+ job1:
+ runs-on: ubuntu-latest
+ steps:
+ - run: |
+ echo "Run attempt: ${{ github.run_attempt }}"
+`
+ firstOutcome := &mockTaskOutcome{
+ result: runnerv1.Result_RESULT_SUCCESS,
+ logRows: []*runnerv1.LogRow{
+ {
+ Time: timestamppb.New(now.Add(1 * time.Second)),
+ Content: " \U0001F433 docker create image",
+ },
+ {
+ Time: timestamppb.New(now.Add(2 * time.Second)),
+ Content: "Run attempt: 1",
+ },
+ {
+ Time: timestamppb.New(now.Add(3 * time.Second)),
+ Content: "\U0001F3C1 Job succeeded",
+ },
+ },
+ }
+ secondOutcome := &mockTaskOutcome{
+ result: runnerv1.Result_RESULT_SUCCESS,
+ logRows: []*runnerv1.LogRow{
+ {
+ Time: timestamppb.New(now.Add(1 * time.Second)),
+ Content: " \U0001F433 docker create image",
+ },
+ {
+ Time: timestamppb.New(now.Add(2 * time.Second)),
+ Content: "Run attempt: 2",
+ },
+ {
+ Time: timestamppb.New(now.Add(3 * time.Second)),
+ Content: "\U0001F3C1 Job succeeded",
+ },
+ },
+ }
+
+ onApplicationRun(t, func(t *testing.T, u *url.URL) {
+ user2 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
+ session := loginUser(t, user2.Name)
+ token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository, auth_model.AccessTokenScopeWriteUser)
+
+ repo := createActionsTestRepo(t, token, "actions-download-task-logs", false)
+
+ runner := newMockRunner()
+ runner.registerAsRepoRunner(t, user2.Name, repo.Name, "mock-runner", []string{"ubuntu-latest"})
+
+ opts := getWorkflowCreateFileOptions(user2, repo.DefaultBranch, fmt.Sprintf("Create %s", treePath), fileContent)
+ createWorkflowFile(t, token, user2.Name, repo.Name, treePath, opts)
+
+ // Execute first run
+ task := runner.fetchTask(t)
+ runner.execTask(t, task, firstOutcome)
+
+ // Download task logs and check content
+ runIndex := task.Context.GetFields()["run_number"].GetStringValue()
+ attempt := task.Context.GetFields()["run_attempt"].GetStringValue()
+ logURL := fmt.Sprintf("/%s/%s/actions/runs/%s/jobs/0/attempt/%s/logs", user2.Name, repo.Name, runIndex, attempt)
+ logRequest := NewRequest(t, "GET", logURL)
+ logResponse := session.MakeRequest(t, logRequest, http.StatusOK)
+ logTextLines := strings.Split(strings.TrimSpace(logResponse.Body.String()), "\n")
+ assert.Len(t, logTextLines, len(firstOutcome.logRows))
+ for idx, lr := range firstOutcome.logRows {
+ assert.Equal(
+ t,
+ fmt.Sprintf("%s %s", lr.Time.AsTime().Format("2006-01-02T15:04:05.0000000Z07:00"), lr.Content),
+ logTextLines[idx],
+ )
+ }
+
+ // Trigger rerun
+ rerunURL := fmt.Sprintf("/%s/%s/actions/runs/%s/rerun", user2.Name, repo.Name, runIndex)
+ rerunRequest := NewRequest(t, "POST", rerunURL)
+ session.MakeRequest(t, rerunRequest, http.StatusOK)
+
+ // Execute rerun task
+ rerunTask := runner.fetchTask(t)
+ runner.execTask(t, rerunTask, secondOutcome)
+
+ // Download rerun task logs and check content
+ rerunIndex := rerunTask.Context.GetFields()["run_number"].GetStringValue()
+ rerunAttempt := rerunTask.Context.GetFields()["run_attempt"].GetStringValue()
+ rerunLogURL := fmt.Sprintf("/%s/%s/actions/runs/%s/jobs/0/attempt/%s/logs", user2.Name, repo.Name, rerunIndex, rerunAttempt)
+ rerunLogRequest := NewRequest(t, "GET", rerunLogURL)
+ rerunLogResponse := session.MakeRequest(t, rerunLogRequest, http.StatusOK)
+ rerunLogTextLines := strings.Split(strings.TrimSpace(rerunLogResponse.Body.String()), "\n")
+ assert.Len(t, rerunLogTextLines, len(secondOutcome.logRows))
+ for idx, lr := range secondOutcome.logRows {
+ assert.Equal(
+ t,
+ fmt.Sprintf("%s %s", lr.Time.AsTime().Format("2006-01-02T15:04:05.0000000Z07:00"), lr.Content),
+ rerunLogTextLines[idx],
+ )
+ }
+
+ httpContext := NewAPITestContext(t, user2.Name, repo.Name, auth_model.AccessTokenScopeWriteRepository)
+ doAPIDeleteRepository(httpContext)(t)
+ })
+}
diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue
index 88db677243..8d2d82d022 100644
--- a/web_src/js/components/RepoActionView.vue
+++ b/web_src/js/components/RepoActionView.vue
@@ -657,7 +657,7 @@ export default {
{{ locale.showFullScreen }}
-
+
{{ locale.downloadLogs }}