From 811f44053fa39c5eb6d65f8e760d75ebce38de8a Mon Sep 17 00:00:00 2001 From: Fredrik Ahlgren Date: Wed, 28 Oct 2026 01:31:47 +0100 Subject: [PATCH 1/2] test(site): the runner plans again before each job, oldest PR first The runner planned once and then ran the whole list. A list of ten PRs takes three hours, so it tested heads that had moved on, and a second runner ran the same commits again. Now it plans before each job, so a commit another runner has marked pending is skipped and a moved PR runs at its new head. Pull requests run in number order. Co-Authored-By: Claude Opus 5.5 --- go/test/site/runner/main.go | 22 ++++++++++++++------- go/test/site/runner/runner.go | 14 ++++++++++++++ go/test/site/runner/runner_test.go | 31 ++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 7 deletions(-) diff --git a/go/test/site/runner/main.go b/go/test/site/runner/main.go index e63046543..6a5e0bee6 100644 --- a/go/test/site/runner/main.go +++ b/go/test/site/runner/main.go @@ -80,13 +80,21 @@ func (r *runner) prepare() error { // tick runs everything that is due, one job at a time. func (r *runner) tick() { stateFile := filepath.Join(r.work, "last-random") - last, _ := os.ReadFile(stateFile) - jobs, err := plan(r.gh, r.cfg, time.Now(), strings.TrimSpace(string(last))) - if err != nil { - log.Printf("plan: %v", err) - return - } - for _, j := range jobs { + // Plan again before each job: a run takes about 20 minutes, in which a + // pull request can move on or a second runner can take the same commit. + ran := map[string]bool{} + for { + last, _ := os.ReadFile(stateFile) + jobs, err := plan(r.gh, r.cfg, time.Now(), strings.TrimSpace(string(last))) + if err != nil { + log.Printf("plan: %v", err) + break + } + j, ok := next(jobs, ran) + if !ok { + break + } + ran[j.Context+" "+j.SHA] = true log.Printf("start %s", j) state, desc := r.runJob(j) log.Printf("done %s: %s, %s", j, state, desc) diff --git a/go/test/site/runner/runner.go b/go/test/site/runner/runner.go index 4dbbc3022..6ca6c2ea8 100644 --- a/go/test/site/runner/runner.go +++ b/go/test/site/runner/runner.go @@ -3,6 +3,7 @@ package main import ( "encoding/json" "fmt" + "sort" "strings" "time" ) @@ -111,6 +112,8 @@ func plan(gh github, cfg config, now time.Time, lastRandom string) ([]job, error if err != nil { return nil, err } + // Oldest first: lower numbers come earlier in the merge order. + sort.Slice(pulls, func(i, j int) bool { return pulls[i].Number < pulls[j].Number }) for _, p := range pulls { if p.Draft && !cfg.Drafts { continue @@ -142,6 +145,17 @@ func plan(gh github, cfg config, now time.Time, lastRandom string) ([]job, error return jobs, nil } +// next is the first job not yet run in this tick. A job whose status failed +// to post is planned again; this keeps it from running twice. +func next(jobs []job, ran map[string]bool) (job, bool) { + for _, j := range jobs { + if !ran[j.Context+" "+j.SHA] { + return j, true + } + } + return job{}, false +} + func touchesWatched(files []string) bool { for _, f := range files { for _, p := range watchedPaths { diff --git a/go/test/site/runner/runner_test.go b/go/test/site/runner/runner_test.go index 085b469ee..b6288d173 100644 --- a/go/test/site/runner/runner_test.go +++ b/go/test/site/runner/runner_test.go @@ -168,3 +168,34 @@ func TestDescribe(t *testing.T) { t.Fatalf("%d characters", len(desc)) } } + +func TestPlanTakesOldestPullFirstAndNextSkipsWhatRan(t *testing.T) { + watched := []string{"go/internal/control/dispatch.go"} + gh := fakeGitHub{ + master: "m1", + pulls: []pull{pr(9, "c9", "srcfl/ftw", false), pr(3, "c3", "srcfl/ftw", false)}, + files: map[int][]string{9: watched, 3: watched}, + contexts: map[string]map[string]bool{"m1": {ctxFull: true}}, + } + jobs, err := plan(gh, config{Repo: "srcfl/ftw", Drafts: true, RandomAt: -1}, time.Now(), "") + if err != nil { + t.Fatal(err) + } + if len(jobs) != 2 || jobs[0].PR != 3 || jobs[1].PR != 9 { + t.Fatalf("jobs %v, want #3 then #9", jobs) + } + ran := map[string]bool{} + j, ok := next(jobs, ran) + if !ok || j.PR != 3 { + t.Fatalf("first: %v %v", j, ok) + } + // #3's status failed to post, so the next plan lists it again. + ran[j.Context+" "+j.SHA] = true + if j, ok = next(jobs, ran); !ok || j.PR != 9 { + t.Fatalf("second: %v %v", j, ok) + } + ran[j.Context+" "+j.SHA] = true + if _, ok = next(jobs, ran); ok { + t.Fatal("a third job after both ran") + } +} From 993c71457088f7f4b51d95c735865ea4a452011c Mon Sep 17 00:00:00 2001 From: Fredrik Ahlgren Date: Wed, 28 Oct 2026 01:37:21 +0100 Subject: [PATCH 2/2] test(site): the runner takes the most recently updated PR first Number order put weeks-old PRs ahead of the work in review. Co-Authored-By: Claude Opus 5.5 --- go/test/site/runner/runner.go | 12 +++++++----- go/test/site/runner/runner_test.go | 15 ++++++++------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/go/test/site/runner/runner.go b/go/test/site/runner/runner.go index 6ca6c2ea8..9c005a46d 100644 --- a/go/test/site/runner/runner.go +++ b/go/test/site/runner/runner.go @@ -64,9 +64,10 @@ func short(sha string) string { // pull is the part of a pull request the runner needs. type pull struct { - Number int `json:"number"` - Draft bool `json:"draft"` - Head struct { + Number int `json:"number"` + Draft bool `json:"draft"` + UpdatedAt string `json:"updated_at"` // RFC 3339, so it sorts as text + Head struct { SHA string `json:"sha"` Repo struct { FullName string `json:"full_name"` @@ -112,8 +113,9 @@ func plan(gh github, cfg config, now time.Time, lastRandom string) ([]job, error if err != nil { return nil, err } - // Oldest first: lower numbers come earlier in the merge order. - sort.Slice(pulls, func(i, j int) bool { return pulls[i].Number < pulls[j].Number }) + // Most recently updated first: that is the work in review, and a pull + // request untouched for weeks can wait. + sort.SliceStable(pulls, func(i, j int) bool { return pulls[i].UpdatedAt > pulls[j].UpdatedAt }) for _, p := range pulls { if p.Draft && !cfg.Drafts { continue diff --git a/go/test/site/runner/runner_test.go b/go/test/site/runner/runner_test.go index b6288d173..bf4c2ecd5 100644 --- a/go/test/site/runner/runner_test.go +++ b/go/test/site/runner/runner_test.go @@ -169,29 +169,30 @@ func TestDescribe(t *testing.T) { } } -func TestPlanTakesOldestPullFirstAndNextSkipsWhatRan(t *testing.T) { +func TestPlanTakesRecentPullFirstAndNextSkipsWhatRan(t *testing.T) { watched := []string{"go/internal/control/dispatch.go"} gh := fakeGitHub{ master: "m1", - pulls: []pull{pr(9, "c9", "srcfl/ftw", false), pr(3, "c3", "srcfl/ftw", false)}, + pulls: []pull{pr(3, "c3", "srcfl/ftw", false), pr(9, "c9", "srcfl/ftw", false)}, files: map[int][]string{9: watched, 3: watched}, contexts: map[string]map[string]bool{"m1": {ctxFull: true}}, } + gh.pulls[0].UpdatedAt, gh.pulls[1].UpdatedAt = "2026-10-01T08:00:00Z", "2026-10-27T21:00:00Z" jobs, err := plan(gh, config{Repo: "srcfl/ftw", Drafts: true, RandomAt: -1}, time.Now(), "") if err != nil { t.Fatal(err) } - if len(jobs) != 2 || jobs[0].PR != 3 || jobs[1].PR != 9 { - t.Fatalf("jobs %v, want #3 then #9", jobs) + if len(jobs) != 2 || jobs[0].PR != 9 || jobs[1].PR != 3 { + t.Fatalf("jobs %v, want #9 (updated last) then #3", jobs) } ran := map[string]bool{} j, ok := next(jobs, ran) - if !ok || j.PR != 3 { + if !ok || j.PR != 9 { t.Fatalf("first: %v %v", j, ok) } - // #3's status failed to post, so the next plan lists it again. + // #9's status failed to post, so the next plan lists it again. ran[j.Context+" "+j.SHA] = true - if j, ok = next(jobs, ran); !ok || j.PR != 9 { + if j, ok = next(jobs, ran); !ok || j.PR != 3 { t.Fatalf("second: %v %v", j, ok) } ran[j.Context+" "+j.SHA] = true