diff --git a/routers/web/dev/buildview.go b/routers/web/dev/buildview.go index 18c14422ea..dc4ff7cbda 100644 --- a/routers/web/dev/buildview.go +++ b/routers/web/dev/buildview.go @@ -11,8 +11,20 @@ import ( ) func BuildView(ctx *context.Context) { - ctx.Data["RunID"] = ctx.Params("runid") - ctx.Data["JobID"] = ctx.Params("jobid") + runID := ctx.ParamsInt64("runid") + ctx.Data["RunID"] = runID + jobID := ctx.ParamsInt64("jobid") + if jobID <= 0 { + runJobs, err := bots_model.GetRunJobsByRunID(ctx, runID) + if err != nil { + return + } + if len(runJobs) <= 0 { + return + } + jobID = runJobs[0].ID + } + ctx.Data["JobID"] = jobID ctx.HTML(http.StatusOK, "dev/buildview") } diff --git a/routers/web/repo/builds/builds.go b/routers/web/repo/builds/builds.go index d373393691..7db75ff8c8 100644 --- a/routers/web/repo/builds/builds.go +++ b/routers/web/repo/builds/builds.go @@ -11,6 +11,7 @@ import ( "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/base" + "code.gitea.io/gitea/modules/bots" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/util" @@ -40,6 +41,25 @@ func List(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.builds") ctx.Data["PageIsBuildList"] = true + defaultBranch, err := ctx.Repo.GitRepo.GetDefaultBranch() + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + commit, err := ctx.Repo.GitRepo.GetBranchCommit(defaultBranch) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + workflows, err := bots.ListWorkflows(commit) + if err != nil { + ctx.Error(http.StatusInternalServerError, err.Error()) + return + } + + ctx.Data["workflows"] = workflows + page := ctx.FormInt("page") if page <= 0 { page = 1 diff --git a/templates/repo/builds/list.tmpl b/templates/repo/builds/list.tmpl index 04fa020e00..c0de57e7b3 100644 --- a/templates/repo/builds/list.tmpl +++ b/templates/repo/builds/list.tmpl @@ -1,6 +1,11 @@ {{template "base/head" .}}