diff --git a/go/seatlist/bootstrap/mesh-catalog.json b/go/seatlist/bootstrap/mesh-catalog.json index b3c7c8a9..2919b314 100644 --- a/go/seatlist/bootstrap/mesh-catalog.json +++ b/go/seatlist/bootstrap/mesh-catalog.json @@ -1125,64 +1125,6 @@ "description": "the candidates of open groups", "history": 10 }, - { - "name": "verdicts", - "template": "state", - "key-forms": [ - { - "key": "", - "value": { - "type": "object", - "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "module": { - "type": "string" - }, - "state": { - "type": "string" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - } - }, - "unknown": { - "type": "array", - "items": { - "type": "string" - } - }, - "warnings": { - "type": "array", - "items": { - "type": "string" - } - }, - "judge": { - "type": "string" - }, - "at": { - "type": "string", - "description": "when (RFC 3339 time)", - "format": "date-time" - } - }, - "required": [ - "module", - "state" - ], - "description": "a manifest's verdict, by the judge named" - }, - "description": "a manifest's verdict by its digest" - } - ], - "description": "the manifest verdicts", - "history": 5 - }, { "name": "predefined", "template": "state", @@ -1993,6 +1935,13 @@ "branch": { "type": "string", "description": "the watched branch the revision is of" + }, + "movers": { + "type": "array", + "items": { + "$ref": "#/defs/TakeInEntry" + }, + "description": "the movers of the take-in that wrote it, so a redelivered source-moved whose revision is kept says take-in.taken again from them, recomputing nothing (design 47 H §743, H-A-92); absent for one with no mover" } }, "required": [ diff --git a/go/seatlist/bootstrap/mesh-delivery.json b/go/seatlist/bootstrap/mesh-delivery.json index 5546f304..744014a5 100644 --- a/go/seatlist/bootstrap/mesh-delivery.json +++ b/go/seatlist/bootstrap/mesh-delivery.json @@ -553,13 +553,12 @@ "act": { "type": "string", "enum": [ - "merge", "status", "view", "comment", "note" ], - "description": "the act: merge (the seat git's merge-pull), status, view, comment or note" + "description": "the act: status, view, comment or note" }, "repository": { "type": "string", diff --git a/go/seatlist/seatlisttest/seats/mesh-catalog.json b/go/seatlist/seatlisttest/seats/mesh-catalog.json index b3c7c8a9..2919b314 100644 --- a/go/seatlist/seatlisttest/seats/mesh-catalog.json +++ b/go/seatlist/seatlisttest/seats/mesh-catalog.json @@ -1125,64 +1125,6 @@ "description": "the candidates of open groups", "history": 10 }, - { - "name": "verdicts", - "template": "state", - "key-forms": [ - { - "key": "", - "value": { - "type": "object", - "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "module": { - "type": "string" - }, - "state": { - "type": "string" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - } - }, - "unknown": { - "type": "array", - "items": { - "type": "string" - } - }, - "warnings": { - "type": "array", - "items": { - "type": "string" - } - }, - "judge": { - "type": "string" - }, - "at": { - "type": "string", - "description": "when (RFC 3339 time)", - "format": "date-time" - } - }, - "required": [ - "module", - "state" - ], - "description": "a manifest's verdict, by the judge named" - }, - "description": "a manifest's verdict by its digest" - } - ], - "description": "the manifest verdicts", - "history": 5 - }, { "name": "predefined", "template": "state", @@ -1993,6 +1935,13 @@ "branch": { "type": "string", "description": "the watched branch the revision is of" + }, + "movers": { + "type": "array", + "items": { + "$ref": "#/defs/TakeInEntry" + }, + "description": "the movers of the take-in that wrote it, so a redelivered source-moved whose revision is kept says take-in.taken again from them, recomputing nothing (design 47 H §743, H-A-92); absent for one with no mover" } }, "required": [ diff --git a/go/seatlist/seatlisttest/seats/mesh-delivery.json b/go/seatlist/seatlisttest/seats/mesh-delivery.json index 5546f304..744014a5 100644 --- a/go/seatlist/seatlisttest/seats/mesh-delivery.json +++ b/go/seatlist/seatlisttest/seats/mesh-delivery.json @@ -553,13 +553,12 @@ "act": { "type": "string", "enum": [ - "merge", "status", "view", "comment", "note" ], - "description": "the act: merge (the seat git's merge-pull), status, view, comment or note" + "description": "the act: status, view, comment or note" }, "repository": { "type": "string", diff --git a/go/seatlist/seatlisttest/seats/mesh-wants.json b/go/seatlist/seatlisttest/seats/mesh-wants.json index 09488de3..11f475d6 100644 --- a/go/seatlist/seatlisttest/seats/mesh-wants.json +++ b/go/seatlist/seatlisttest/seats/mesh-wants.json @@ -1362,6 +1362,10 @@ "type": "string", "description": "the module's build-input fingerprint at the commit" }, + "asker": { + "type": "string", + "description": "the seat name of the part asking the step, mesh-pipeline-runner for the runner; the assigner names the step's progress with it (design 47 H-A-88, H-A-41)" + }, "run": { "type": "string", "description": "the run on request's id: its composition writes no want (ADR 0666 section 18)" diff --git a/go/testdata/beside/CAPTURED b/go/testdata/beside/CAPTURED index d1ecbc63..95caafc7 100644 --- a/go/testdata/beside/CAPTURED +++ b/go/testdata/beside/CAPTURED @@ -20,6 +20,7 @@ mesh-delivery f006ab50bcc2e5759627f20fa7e5a9c62501032d modules/mesh-delivery-co mesh-delivery f8bbde9627255fe37bd6603a40fcce14fb61d97b modules/mesh-delivery-contracts/seats/git/seat.json, taken again as seat.json.captured (milestone 47/H1, C2) mesh-delivery d24d6a08905996841b62c723736339e809ca4625 modules/mesh-delivery-contracts/seats/git/seat.json, taken again as seat.json.captured (milestone 47/H1, C2 amended, H-A-71) mesh-delivery 6e027de59773affe80d7bf45cf49d81292893ff1 modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json, taken again as seat.json.captured (milestone 47/H1, C3) +mesh-delivery be741a7a8ff17ef9be6ed9a9f1613af5d0777b11 modules/mesh-delivery-contracts/seats/git, mesh-delivery and mesh-catalog, taken again as seat.json.captured (milestone 47/H1, through C1c) mesh-host cdcba9ca73755854d21e4e657d7e46c32b9b5265 internal/apply/placement_guard.go The two seat copies are put back the same way (git show : > .captured, the path kept). To move the others, from this repository's go/ directory, with the two repositories checked out beside mesh-sdk: diff --git a/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json.captured b/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json.captured index b3c7c8a9..2919b314 100644 --- a/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json.captured +++ b/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-catalog/seat.json.captured @@ -1125,64 +1125,6 @@ "description": "the candidates of open groups", "history": 10 }, - { - "name": "verdicts", - "template": "state", - "key-forms": [ - { - "key": "", - "value": { - "type": "object", - "properties": { - "v": { - "type": "integer", - "description": "the layout version" - }, - "module": { - "type": "string" - }, - "state": { - "type": "string" - }, - "problems": { - "type": "array", - "items": { - "type": "string" - } - }, - "unknown": { - "type": "array", - "items": { - "type": "string" - } - }, - "warnings": { - "type": "array", - "items": { - "type": "string" - } - }, - "judge": { - "type": "string" - }, - "at": { - "type": "string", - "description": "when (RFC 3339 time)", - "format": "date-time" - } - }, - "required": [ - "module", - "state" - ], - "description": "a manifest's verdict, by the judge named" - }, - "description": "a manifest's verdict by its digest" - } - ], - "description": "the manifest verdicts", - "history": 5 - }, { "name": "predefined", "template": "state", @@ -1993,6 +1935,13 @@ "branch": { "type": "string", "description": "the watched branch the revision is of" + }, + "movers": { + "type": "array", + "items": { + "$ref": "#/defs/TakeInEntry" + }, + "description": "the movers of the take-in that wrote it, so a redelivered source-moved whose revision is kept says take-in.taken again from them, recomputing nothing (design 47 H §743, H-A-92); absent for one with no mover" } }, "required": [ diff --git a/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json.captured b/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json.captured index 5546f304..744014a5 100644 --- a/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json.captured +++ b/go/testdata/beside/mesh-delivery/modules/mesh-delivery-contracts/seats/mesh-delivery/seat.json.captured @@ -553,13 +553,12 @@ "act": { "type": "string", "enum": [ - "merge", "status", "view", "comment", "note" ], - "description": "the act: merge (the seat git's merge-pull), status, view, comment or note" + "description": "the act: status, view, comment or note" }, "repository": { "type": "string",