Commit `3bcdce33fb`

3bcdce33fb9a2309312854331359d376171c7368

Verified · cmc

cmc <hello@cleberg.net> · 2026-09-28 08:26 UTC

web: step fold shows the step's first line; changelog: deploy order

Ref #266

Layout: unified · split

CHANGELOG.org +4 −1

   a scratch repository per the CI page. (#260)
 - =build show= names a failed build's step and duration; =build log
   --step <n>|failed --tail <lines>= reads one step's output or the
-  last lines of the stored log. (#266)
+  last lines of the stored log. Deploy gitbayd before the runner: an
+  older server refuses the runner's =--step= and =--reason= (exit 2),
+  and its failed builds stay running until the reaper fails them.
+  (#266)
 * v1.36.0 — 2026-09-23

internal/httpd/buildpages_test.go +24

	@@ -230,3 +230,27 @@ func TestBuildPageFoldsStepsAndOpensFailure(t *testing.T) {
230	t.Errorf("%d failed anchors, want 1", n)	230	t.Errorf("%d failed anchors, want 1", n)
231	}	231	}
232	}	232	}
		233
		234	// A multi-line step's fold summary shows only its first line, as build
		235	// show does; the whole step is in the log (#266).
		236	func TestBuildPageStepSummaryIsFirstLine(t *testing.T) {
		237	step := "set -e\ngo test ./..."
		238	b := control.BuildOut{Number: 62, Job: "test", Status: "failure",
		239	SHA: "ff6271a9d4570cd46f169091637a9d2e40ad5c2b", Ref: "main",
		240	CreatedAt: "2026-08-28T04:42:54Z", FinishedAt: "2026-08-28T04:43:54Z", DurationS: 60,
		241	Steps: []string{step}, FailedStep: 1, FailedReason: "exit 1"}
		242	log := "$ git clone x (ff6271a9d4)\n$ " + step + "\n--- FAIL: TestCLI\nstep 1/1 failed: exit 1\n"
		243	v := buildView{repoPage: testRepoPage(), Build: b, Log: log, Duration: "1m0s"}
		244	v.Steps, v.Failed = logSteps(log, b)
		245	var sb strings.Builder
		246	if err := web.Render(&sb, "build.html", v); err != nil {
		247	t.Fatalf("render: %v", err)
		248	}
		249	out := sb.String()
		250	if !strings.Contains(out, "<code>set -e</code>") {
		251	t.Errorf("summary does not show the step's first line:\n%s", out)
		252	}
		253	if strings.Contains(out, "<code>set -e\ngo test") {
		254	t.Errorf("summary shows the whole multi-line step")
		255	}
		256	}

internal/httpd/builds.go +5 −1

 type logStep struct {
 	control.LogSection
+	// Head is the step's first line, which its fold's summary shows, as
+	// build show does; the full step is in the log below it.
+	Head   string
 	Failed bool
 }
 	failed := control.FailedSection(sections, b.Status, b.FailedStep)
 	out := make([]logStep, len(sections))
 	for i, s := range sections {
-		out[i] = logStep{LogSection: s, Failed: i == failed}
+		head, _, _ := strings.Cut(s.Step, "\n")
+		out[i] = logStep{LogSection: s, Head: head, Failed: i == failed}
 	}
 	return out, failed >= 0
 }

internal/web/templates/build.html +1 −1

	@@ -16,7 +16,7 @@
16	<pre class="code buildlog" tabindex="0">{{.Log}}</pre>	16	<pre class="code buildlog" tabindex="0">{{.Log}}</pre>
17	{{else if .Steps}}{{$total := len .Build.Steps}}{{range .Steps}}	17	{{else if .Steps}}{{$total := len .Build.Steps}}{{range .Steps}}
18	<details class="difffold buildstep"{{if .Failed}} id="failed" open{{end}}>	18	<details class="difffold buildstep"{{if .Failed}} id="failed" open{{end}}>
19	<summary>{{if .N}}<span>step {{.N}}/{{$total}}</span> <code>{{.Step}}</code>{{else}}<span>setup</span>{{end}}{{if .Failed}} <span class="chip check-failure">failed</span>{{end}}</summary>	19	<summary>{{if .N}}<span>step {{.N}}/{{$total}}</span> <code>{{.Head}}</code>{{else}}<span>setup</span>{{end}}{{if .Failed}} <span class="chip check-failure">failed</span>{{end}}</summary>
20	<pre class="code buildlog" tabindex="0">{{.Text}}</pre>	20	<pre class="code buildlog" tabindex="0">{{.Text}}</pre>
21	</details>{{end}}	21	</details>{{end}}
22	{{else if .Log}}<pre class="code buildlog" tabindex="0">{{.Log}}</pre>{{else}}<p class="empty-note">no log yet</p>{{end}}	22	{{else if .Log}}<pre class="code buildlog" tabindex="0">{{.Log}}</pre>{{else}}<p class="empty-note">no log yet</p>{{end}}

Commit 3bcdce33fb