From 83732dcd53d83d256bfb6d608e44ae3b12db075c Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 7 Nov 2026 19:43:08 +0100 Subject: [PATCH] Take the Go package artifacts out of the delivery parts for now, so the running builder builds them (issue 1966) The running builder predates Go package artifacts ("refused kind: package of language go ... no build module builds it"), so it can build neither the new builder, the grants module, the Go build module nor the checker: each new part is needed before the others can be built or delivered. For the bootstrap of the registry delivery, at the operator's word (19:4x, "do the temporary change"), the package artifacts leave the manifests of the parts that run; the contracts and SDK modules, which run on no node, keep theirs. They come back in one change once the new builder runs. Quick vs thorough: quick; the thorough fix is 47/G's tier order (issue 1921 note 80). Claude-Session: https://claude.ai/code/session_01NcbgfFSnn24M3GcqttoU7i --- modules/disk-load/cmd/disk-load/packages_test.go | 8 ++------ modules/disk-load/module.json | 9 --------- .../mesh-build-go/cmd/mesh-build-go/manifest_test.go | 11 ++--------- modules/mesh-build-go/module.json | 9 --------- modules/restic/cmd/restic-backups/packages_test.go | 8 ++------ modules/restic/module.json | 9 --------- .../ssh-client/cmd/ssh-client-tools/templates_test.go | 11 ++--------- modules/ssh-client/module.json | 9 --------- 8 files changed, 8 insertions(+), 66 deletions(-) diff --git a/modules/disk-load/cmd/disk-load/packages_test.go b/modules/disk-load/cmd/disk-load/packages_test.go index dabc59ef9..bcb5ebc08 100644 --- a/modules/disk-load/cmd/disk-load/packages_test.go +++ b/modules/disk-load/cmd/disk-load/packages_test.go @@ -29,10 +29,6 @@ func TestTheReadingsLayoutIsAPublishedPackageOfThisModule(t *testing.T) { if !slices.Contains(m.Reads, engineDataRead) { t.Errorf("reads %v do not name %s", m.Reads, engineDataRead) } - for _, a := range m.Build.Artifacts { - if a.Name == "diskreadings" && a.Kind == "package" && a.Series == "0.1" && len(a.Paths) == 1 && a.Paths[0] == "diskreadings" { - return - } - } - t.Errorf("no package artifact diskreadings of series 0.1 in %s", raw) + // Issue 1966's bootstrap: the package artifact diskreadings is out of the manifest until the new builder runs; the follow-up + // puts this check back. } diff --git a/modules/disk-load/module.json b/modules/disk-load/module.json index 4cbd028d5..7b162bf90 100644 --- a/modules/disk-load/module.json +++ b/modules/disk-load/module.json @@ -24,15 +24,6 @@ "loads": [ "disk-load" ] - }, - { - "name": "diskreadings", - "kind": "package", - "language": "go", - "paths": [ - "diskreadings" - ], - "series": "0.1" } ] }, diff --git a/modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go b/modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go index 80ae3f70f..9d65182ee 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/manifest_test.go @@ -85,15 +85,8 @@ func TestManifestDeclaresTheAccountTheCapabilityAndThePackages(t *testing.T) { } // buildstep, which mesh-build-node and mesh-build-image require, is a Go package of this module, numbered in // series 0.1 (CAT-BG6; ADR 0606): its users accept a series, never a commit. - declared := false - for _, a := range m.Build.Artifacts { - if a.Name == "buildstep" { - declared = a.Kind == "package" && a.Language == "go" && slices.Equal(a.Paths, []string{"buildstep"}) && a.Series == "0.1" - } - } - if !declared { - t.Errorf("artifacts %+v declare no Go package buildstep in series 0.1", m.Build.Artifacts) - } + // Issue 1966's bootstrap: the package artifact buildstep is out of the manifest until the new builder runs; the follow-up + // puts this check back. } // The work and cache directories are outside the home (ADR 0466 §1), owned by the account. diff --git a/modules/mesh-build-go/module.json b/modules/mesh-build-go/module.json index 21698ddb5..7fc756e23 100644 --- a/modules/mesh-build-go/module.json +++ b/modules/mesh-build-go/module.json @@ -213,15 +213,6 @@ "name": "files", "kind": "archive", "from": "files" - }, - { - "name": "buildstep", - "kind": "package", - "language": "go", - "paths": [ - "buildstep" - ], - "series": "0.1" } ] } diff --git a/modules/restic/cmd/restic-backups/packages_test.go b/modules/restic/cmd/restic-backups/packages_test.go index e0e09d9b1..021c6bdb4 100644 --- a/modules/restic/cmd/restic-backups/packages_test.go +++ b/modules/restic/cmd/restic-backups/packages_test.go @@ -23,10 +23,6 @@ func TestTheReadingsLayoutIsAPublishedPackageOfThisModule(t *testing.T) { if err := json.Unmarshal(raw, &m); err != nil { t.Fatal(err) } - for _, a := range m.Build.Artifacts { - if a.Name == "backupgood" && a.Kind == "package" && a.Series == "0.1" && len(a.Paths) == 1 && a.Paths[0] == "backupgood" { - return - } - } - t.Errorf("no package artifact backupgood of series 0.1 in %s", raw) + // Issue 1966's bootstrap: the package artifact backupgood is out of the manifest until the new builder runs; the follow-up + // puts this check back. } diff --git a/modules/restic/module.json b/modules/restic/module.json index 73fbfd96b..cd194f90a 100644 --- a/modules/restic/module.json +++ b/modules/restic/module.json @@ -196,15 +196,6 @@ "name": "files", "kind": "archive", "from": "files" - }, - { - "name": "backupgood", - "kind": "package", - "language": "go", - "paths": [ - "backupgood" - ], - "series": "0.1" } ] }, diff --git a/modules/ssh-client/cmd/ssh-client-tools/templates_test.go b/modules/ssh-client/cmd/ssh-client-tools/templates_test.go index 20cbcb184..8293e6499 100644 --- a/modules/ssh-client/cmd/ssh-client-tools/templates_test.go +++ b/modules/ssh-client/cmd/ssh-client-tools/templates_test.go @@ -63,15 +63,8 @@ func TestEveryFileTakesItsTextFromATemplate(t *testing.T) { t.Errorf("the build packs files/ into %d archives, not one", packs) } // The key keeper is this module's published package, taken by series (ADR 0634 §1). - published := false - for _, a := range m.Build.Artifacts { - if a["name"] == "sshkeys" && a["kind"] == "package" && a["series"] == "0.1" { - published = true - } - } - if !published { - t.Errorf("no package artifact sshkeys of series 0.1 in the build") - } + // Issue 1966's bootstrap: the package artifact sshkeys is out of the manifest until the new builder runs; the follow-up + // puts this check back. } // Issue 955, area S2: the module keeps the keys state and requires the forge's account provision. It declares diff --git a/modules/ssh-client/module.json b/modules/ssh-client/module.json index 0baf377f9..a6965445a 100644 --- a/modules/ssh-client/module.json +++ b/modules/ssh-client/module.json @@ -106,15 +106,6 @@ "name": "files", "kind": "archive", "from": "files" - }, - { - "name": "sshkeys", - "kind": "package", - "language": "go", - "paths": [ - "sshkeys" - ], - "series": "0.1" } ] } -- 2.54.0