diff --git a/modules/mesh-delivery-assigner/module.json b/modules/mesh-delivery-assigner/module.json index b1b56213..343388ba 100644 --- a/modules/mesh-delivery-assigner/module.json +++ b/modules/mesh-delivery-assigner/module.json @@ -156,15 +156,6 @@ "MESH_VIEW_CALLERS_SEAT_HOLDERS": "node-tools", "MESH_VIEW_CALLERS_WANTS": "mesh-grants" } - }, - { - "name": "asks", - "kind": "package", - "language": "go", - "paths": [ - "asks" - ], - "series": "0.1" } ] } diff --git a/modules/mesh-delivery-builder/manifest_test.go b/modules/mesh-delivery-builder/manifest_test.go index 2829d711..4ef9d37e 100644 --- a/modules/mesh-delivery-builder/manifest_test.go +++ b/modules/mesh-delivery-builder/manifest_test.go @@ -200,12 +200,10 @@ func TestManifestProcess(t *testing.T) { // 1607/AC1 if _, bus := p["bus"]; bus { t.Errorf("the process declares a bus: it runs on its own broker credential") } - if len(m.Build.Artifacts) != 3 { - t.Fatalf("artifacts = %+v, want the program, the tools and the package builds", m.Build.Artifacts) - } - // ADR 0634 §1, ADR 0606 §4: the module's own package is published, so a module of another repository imports it by version. - if a := m.Build.Artifacts[2]; a.Name != "builds" || a.Kind != "package" || a.Language != "go" || !reflect.DeepEqual(a.Paths, []string{"builds"}) || a.Series != "0.1" { - t.Errorf("package artifact = %+v", a) + // Issue 1966's bootstrap: the package artifact builds is out of the manifest until the new builder runs; the follow-up + // puts it back with its assertion (ADR 0634 §1, ADR 0606 §4: three artifacts, the third the package builds). + if len(m.Build.Artifacts) != 2 { + t.Fatalf("artifacts = %+v, want the program and the tools", m.Build.Artifacts) } if a := m.Build.Artifacts[1]; a.Name != "tools" || a.Kind != "bundle" || a.Binary != "mesh-delivery-builder-tools" || !reflect.DeepEqual(a.Loads, []string{"mesh-delivery-builder-tools"}) { t.Errorf("tools artifact = %+v", a) // 1945 diff --git a/modules/mesh-delivery-builder/module.json b/modules/mesh-delivery-builder/module.json index af712bce..6ac35f0c 100644 --- a/modules/mesh-delivery-builder/module.json +++ b/modules/mesh-delivery-builder/module.json @@ -168,15 +168,6 @@ "loads": [ "mesh-delivery-builder-tools" ] - }, - { - "name": "builds", - "kind": "package", - "language": "go", - "paths": [ - "builds" - ], - "series": "0.1" } ] } diff --git a/modules/mesh-delivery-checker/manifest_test.go b/modules/mesh-delivery-checker/manifest_test.go index 36416382..22e1f177 100644 --- a/modules/mesh-delivery-checker/manifest_test.go +++ b/modules/mesh-delivery-checker/manifest_test.go @@ -263,12 +263,10 @@ func TestManifestProcess(t *testing.T) { // 1678/AC1 t.Errorf("the process declares a bus: it runs on its own broker credential") } // The settings template is packed as the files archive (novox/hq ADR 0349 §2), or the indexer's judge refuses it. - if len(m.Build.Artifacts) != 4 { - t.Fatalf("artifacts = %+v, want the program, the tools, the files archive and the package checkermsg", m.Build.Artifacts) - } - // The checker's own published layouts, as forgemsg is the forge bridge's (ADR 0634 section 2): the indexer requires them by a published version. - if a := m.Build.Artifacts[3]; a.Name != "checkermsg" || a.Kind != "package" || a.Language != "go" || len(a.Paths) != 1 || a.Paths[0] != "checkermsg" || a.Series != "0.1" { - t.Errorf("the package artifact = %+v", a) + // Issue 1966's bootstrap: the package artifact checkermsg is out of the manifest until the new builder runs; the + // follow-up puts it back with its assertion (ADR 0634 section 2: four artifacts, the fourth the package checkermsg). + if len(m.Build.Artifacts) != 3 { + t.Fatalf("artifacts = %+v, want the program, the tools and the files archive", m.Build.Artifacts) } if a := m.Build.Artifacts[2]; a.Name != "files" || a.Kind != "archive" || a.From != "files" { t.Errorf("files artifact = %+v, want an archive from files/", a) diff --git a/modules/mesh-delivery-checker/module.json b/modules/mesh-delivery-checker/module.json index fcce74fa..7acb3125 100644 --- a/modules/mesh-delivery-checker/module.json +++ b/modules/mesh-delivery-checker/module.json @@ -190,15 +190,6 @@ "name": "files", "kind": "archive", "from": "files" - }, - { - "name": "checkermsg", - "kind": "package", - "language": "go", - "paths": [ - "checkermsg" - ], - "series": "0.1" } ] } diff --git a/modules/mesh-delivery-forge-bridge/manifest_test.go b/modules/mesh-delivery-forge-bridge/manifest_test.go index 1647c605..0f4b8860 100644 --- a/modules/mesh-delivery-forge-bridge/manifest_test.go +++ b/modules/mesh-delivery-forge-bridge/manifest_test.go @@ -152,12 +152,10 @@ func TestManifestProcess(t *testing.T) { // 1235/AC1 if _, bus := p["bus"]; bus { t.Errorf("the process declares a bus: it runs on its own broker credential") } - if len(m.Build.Artifacts) != 3 || m.Build.Artifacts[1].Name != "tools" || m.Build.Artifacts[1].From != "cmd/mesh-delivery-forge-bridge-tools" { - t.Fatalf("artifacts = %+v, want the program, the tools bundle and the package forgemsg", m.Build.Artifacts) - } - // ADR 0573 §1: the gate requires forgemsg by a published version, so the module declares it as a package. - if a := m.Build.Artifacts[2]; a.Name != "forgemsg" || a.Kind != "package" || a.Language != "go" || len(a.Paths) != 1 || a.Paths[0] != "forgemsg" || a.Series != "0.1" { - t.Errorf("package artifact = %+v", a) + // Issue 1966's bootstrap: the package artifact forgemsg is out of the manifest until the new builder runs; the follow-up + // puts it back with its assertion (ADR 0573 §1: three artifacts, the third the package forgemsg). + if len(m.Build.Artifacts) != 2 || m.Build.Artifacts[1].Name != "tools" || m.Build.Artifacts[1].From != "cmd/mesh-delivery-forge-bridge-tools" { + t.Fatalf("artifacts = %+v, want the program and the tools bundle", m.Build.Artifacts) } a := m.Build.Artifacts[0] if st, err := os.Stat(a.From); err != nil || !st.IsDir() || a.Binary != "mesh-delivery-forge-bridge" || !strings.HasSuffix(a.From, a.Binary) { diff --git a/modules/mesh-delivery-forge-bridge/module.json b/modules/mesh-delivery-forge-bridge/module.json index 15ad7ee0..2b214bd6 100644 --- a/modules/mesh-delivery-forge-bridge/module.json +++ b/modules/mesh-delivery-forge-bridge/module.json @@ -95,15 +95,6 @@ "loads": [ "mesh-delivery-forge-bridge-tools" ] - }, - { - "name": "forgemsg", - "kind": "package", - "language": "go", - "paths": [ - "forgemsg" - ], - "series": "0.1" } ] } diff --git a/modules/mesh-delivery-view/manifest_test.go b/modules/mesh-delivery-view/manifest_test.go index 47c1fdab..a2e58671 100644 --- a/modules/mesh-delivery-view/manifest_test.go +++ b/modules/mesh-delivery-view/manifest_test.go @@ -206,7 +206,9 @@ func TestManifestIsTakenAndReadsOnly(t *testing.T) { // 1134/AC7 func TestManifestIsWholeInItsRepository(t *testing.T) { // 1134/AC7 m, _ := load(t) - if len(m.Build.Artifacts) != 5 { + // Issue 1966's bootstrap: the package artifact viewstate is out of the manifest until the new builder runs; the + // follow-up puts the count back at 5. + if len(m.Build.Artifacts) != 4 { t.Fatalf("artifacts = %+v", m.Build.Artifacts) } for _, a := range m.Build.Artifacts { diff --git a/modules/mesh-delivery-view/module.json b/modules/mesh-delivery-view/module.json index a56e8c08..81d90b74 100644 --- a/modules/mesh-delivery-view/module.json +++ b/modules/mesh-delivery-view/module.json @@ -186,15 +186,6 @@ "name": "files", "kind": "archive", "from": "files" - }, - { - "name": "viewstate", - "kind": "package", - "language": "go", - "paths": [ - "viewstate" - ], - "series": "0.1" } ] } diff --git a/modules/mesh-grants/module.json b/modules/mesh-grants/module.json index e2684b89..c60bfcea 100644 --- a/modules/mesh-grants/module.json +++ b/modules/mesh-grants/module.json @@ -138,24 +138,6 @@ "loads": [ "mesh-grants" ] - }, - { - "name": "grantsstate", - "kind": "package", - "language": "go", - "paths": [ - "grantsstate" - ], - "series": "0.1" - }, - { - "name": "busgrants", - "kind": "package", - "language": "go", - "paths": [ - "busgrants" - ], - "series": "0.1" } ] }