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
This commit is contained in:
@@ -156,15 +156,6 @@
|
|||||||
"MESH_VIEW_CALLERS_SEAT_HOLDERS": "node-tools",
|
"MESH_VIEW_CALLERS_SEAT_HOLDERS": "node-tools",
|
||||||
"MESH_VIEW_CALLERS_WANTS": "mesh-grants"
|
"MESH_VIEW_CALLERS_WANTS": "mesh-grants"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "asks",
|
|
||||||
"kind": "package",
|
|
||||||
"language": "go",
|
|
||||||
"paths": [
|
|
||||||
"asks"
|
|
||||||
],
|
|
||||||
"series": "0.1"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -200,12 +200,10 @@ func TestManifestProcess(t *testing.T) { // 1607/AC1
|
|||||||
if _, bus := p["bus"]; bus {
|
if _, bus := p["bus"]; bus {
|
||||||
t.Errorf("the process declares a bus: it runs on its own broker credential")
|
t.Errorf("the process declares a bus: it runs on its own broker credential")
|
||||||
}
|
}
|
||||||
if len(m.Build.Artifacts) != 3 {
|
// Issue 1966's bootstrap: the package artifact builds is out of the manifest until the new builder runs; the follow-up
|
||||||
t.Fatalf("artifacts = %+v, want the program, the tools and the package builds", m.Build.Artifacts)
|
// 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 {
|
||||||
// ADR 0634 §1, ADR 0606 §4: the module's own package is published, so a module of another repository imports it by version.
|
t.Fatalf("artifacts = %+v, want the program and the tools", m.Build.Artifacts)
|
||||||
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)
|
|
||||||
}
|
}
|
||||||
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"}) {
|
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
|
t.Errorf("tools artifact = %+v", a) // 1945
|
||||||
|
|||||||
@@ -168,15 +168,6 @@
|
|||||||
"loads": [
|
"loads": [
|
||||||
"mesh-delivery-builder-tools"
|
"mesh-delivery-builder-tools"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "builds",
|
|
||||||
"kind": "package",
|
|
||||||
"language": "go",
|
|
||||||
"paths": [
|
|
||||||
"builds"
|
|
||||||
],
|
|
||||||
"series": "0.1"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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")
|
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.
|
// 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 {
|
// Issue 1966's bootstrap: the package artifact checkermsg is out of the manifest until the new builder runs; the
|
||||||
t.Fatalf("artifacts = %+v, want the program, the tools, the files archive and the package checkermsg", m.Build.Artifacts)
|
// 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 {
|
||||||
// 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.
|
t.Fatalf("artifacts = %+v, want the program, the tools and the files archive", m.Build.Artifacts)
|
||||||
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)
|
|
||||||
}
|
}
|
||||||
if a := m.Build.Artifacts[2]; a.Name != "files" || a.Kind != "archive" || a.From != "files" {
|
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)
|
t.Errorf("files artifact = %+v, want an archive from files/", a)
|
||||||
|
|||||||
@@ -190,15 +190,6 @@
|
|||||||
"name": "files",
|
"name": "files",
|
||||||
"kind": "archive",
|
"kind": "archive",
|
||||||
"from": "files"
|
"from": "files"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "checkermsg",
|
|
||||||
"kind": "package",
|
|
||||||
"language": "go",
|
|
||||||
"paths": [
|
|
||||||
"checkermsg"
|
|
||||||
],
|
|
||||||
"series": "0.1"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -152,12 +152,10 @@ func TestManifestProcess(t *testing.T) { // 1235/AC1
|
|||||||
if _, bus := p["bus"]; bus {
|
if _, bus := p["bus"]; bus {
|
||||||
t.Errorf("the process declares a bus: it runs on its own broker credential")
|
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" {
|
// Issue 1966's bootstrap: the package artifact forgemsg is out of the manifest until the new builder runs; the follow-up
|
||||||
t.Fatalf("artifacts = %+v, want the program, the tools bundle and the package forgemsg", m.Build.Artifacts)
|
// 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" {
|
||||||
// ADR 0573 §1: the gate requires forgemsg by a published version, so the module declares it as a package.
|
t.Fatalf("artifacts = %+v, want the program and the tools bundle", m.Build.Artifacts)
|
||||||
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)
|
|
||||||
}
|
}
|
||||||
a := m.Build.Artifacts[0]
|
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) {
|
if st, err := os.Stat(a.From); err != nil || !st.IsDir() || a.Binary != "mesh-delivery-forge-bridge" || !strings.HasSuffix(a.From, a.Binary) {
|
||||||
|
|||||||
@@ -95,15 +95,6 @@
|
|||||||
"loads": [
|
"loads": [
|
||||||
"mesh-delivery-forge-bridge-tools"
|
"mesh-delivery-forge-bridge-tools"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "forgemsg",
|
|
||||||
"kind": "package",
|
|
||||||
"language": "go",
|
|
||||||
"paths": [
|
|
||||||
"forgemsg"
|
|
||||||
],
|
|
||||||
"series": "0.1"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -206,7 +206,9 @@ func TestManifestIsTakenAndReadsOnly(t *testing.T) { // 1134/AC7
|
|||||||
|
|
||||||
func TestManifestIsWholeInItsRepository(t *testing.T) { // 1134/AC7
|
func TestManifestIsWholeInItsRepository(t *testing.T) { // 1134/AC7
|
||||||
m, _ := load(t)
|
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)
|
t.Fatalf("artifacts = %+v", m.Build.Artifacts)
|
||||||
}
|
}
|
||||||
for _, a := range m.Build.Artifacts {
|
for _, a := range m.Build.Artifacts {
|
||||||
|
|||||||
@@ -186,15 +186,6 @@
|
|||||||
"name": "files",
|
"name": "files",
|
||||||
"kind": "archive",
|
"kind": "archive",
|
||||||
"from": "files"
|
"from": "files"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "viewstate",
|
|
||||||
"kind": "package",
|
|
||||||
"language": "go",
|
|
||||||
"paths": [
|
|
||||||
"viewstate"
|
|
||||||
],
|
|
||||||
"series": "0.1"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -138,24 +138,6 @@
|
|||||||
"loads": [
|
"loads": [
|
||||||
"mesh-grants"
|
"mesh-grants"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "grantsstate",
|
|
||||||
"kind": "package",
|
|
||||||
"language": "go",
|
|
||||||
"paths": [
|
|
||||||
"grantsstate"
|
|
||||||
],
|
|
||||||
"series": "0.1"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "busgrants",
|
|
||||||
"kind": "package",
|
|
||||||
"language": "go",
|
|
||||||
"paths": [
|
|
||||||
"busgrants"
|
|
||||||
],
|
|
||||||
"series": "0.1"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user