diff --git a/modules/mesh-build-go/buildstep/askrun.go b/modules/mesh-build-go/buildstep/askrun.go index 9c73e967c..aba1dfeaf 100644 --- a/modules/mesh-build-go/buildstep/askrun.go +++ b/modules/mesh-build-go/buildstep/askrun.go @@ -4,13 +4,14 @@ import ( "context" "encoding/json" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" "maps" "path" "slices" "sort" "strings" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" ) // **One ask, one whole job** (novox/hq ADR 0525 §3). A build module runs a pulled ask with its own step tools' bodies, diff --git a/modules/mesh-build-go/buildstep/askrun_test.go b/modules/mesh-build-go/buildstep/askrun_test.go index 3cf0985c4..07dfa08a3 100644 --- a/modules/mesh-build-go/buildstep/askrun_test.go +++ b/modules/mesh-build-go/buildstep/askrun_test.go @@ -5,11 +5,12 @@ import ( "encoding/json" "errors" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "slices" "strings" "testing" "time" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) const runCommit = "0123456789abcdef0123456789abcdef01234567" diff --git a/modules/mesh-build-go/buildstep/capacity_cpu.go b/modules/mesh-build-go/buildstep/capacity_cpu.go index dc4df230e..ff9e3c829 100644 --- a/modules/mesh-build-go/buildstep/capacity_cpu.go +++ b/modules/mesh-build-go/buildstep/capacity_cpu.go @@ -3,7 +3,6 @@ package buildstep import ( "encoding/json" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "math" "os" "runtime" @@ -11,6 +10,7 @@ import ( "strings" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/buildcpu" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // **A build seat's capacity follows the CPU its node gives builds** (issue 1806's follow-up; issue 1890, 2026-10-26 diff --git a/modules/mesh-build-go/buildstep/conformance/conformance_test.go b/modules/mesh-build-go/buildstep/conformance/conformance_test.go index a70dd2c98..b1460c86d 100644 --- a/modules/mesh-build-go/buildstep/conformance/conformance_test.go +++ b/modules/mesh-build-go/buildstep/conformance/conformance_test.go @@ -3,12 +3,12 @@ package conformance import ( "context" "encoding/json" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" "strings" "testing" "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) diff --git a/modules/mesh-build-go/buildstep/digestshape_test.go b/modules/mesh-build-go/buildstep/digestshape_test.go index 3259f19e6..374a6e26d 100644 --- a/modules/mesh-build-go/buildstep/digestshape_test.go +++ b/modules/mesh-build-go/buildstep/digestshape_test.go @@ -5,12 +5,13 @@ import ( "encoding/json" "errors" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "sort" "strings" "sync" "testing" "time" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // credentialField is the node runtime's rule for a state value (mesh-tools node-tools/internal/bus/state.go, novox/hq diff --git a/modules/mesh-build-go/buildstep/generated_test.go b/modules/mesh-build-go/buildstep/generated_test.go index d4aa6c42b..a1eb3efcf 100644 --- a/modules/mesh-build-go/buildstep/generated_test.go +++ b/modules/mesh-build-go/buildstep/generated_test.go @@ -3,7 +3,6 @@ package buildstep import ( "context" "errors" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "reflect" @@ -12,6 +11,7 @@ import ( "testing" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/seatgen" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // contracts writes a contracts module of one seat, its generated files as the generator writes them, and answers its diff --git a/modules/mesh-build-go/buildstep/latepublish.go b/modules/mesh-build-go/buildstep/latepublish.go index c81070703..46bf19c2f 100644 --- a/modules/mesh-build-go/buildstep/latepublish.go +++ b/modules/mesh-build-go/buildstep/latepublish.go @@ -13,13 +13,13 @@ import ( "context" "errors" "fmt" - builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "io" "log" "slices" "time" reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-delivery/sdk/parts" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/narrate_test.go b/modules/mesh-build-go/buildstep/narrate_test.go index 21078e8ce..5b27e9b60 100644 --- a/modules/mesh-build-go/buildstep/narrate_test.go +++ b/modules/mesh-build-go/buildstep/narrate_test.go @@ -5,13 +5,13 @@ import ( "encoding/json" "errors" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "strings" "sync" "testing" "time" reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // CAT-NR1: a build's publish on a seat says asked, waiting on the seat (on every tick of NarrateEvery while the holder diff --git a/modules/mesh-build-go/buildstep/phase.go b/modules/mesh-build-go/buildstep/phase.go index 187d4ea3e..ffb0168fc 100644 --- a/modules/mesh-build-go/buildstep/phase.go +++ b/modules/mesh-build-go/buildstep/phase.go @@ -2,10 +2,11 @@ package buildstep import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "strings" "sync" "time" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // **A running ask says its phases** (issue 1890, 2026-10-26 19:09: a mesh-catalog try's step on the workstation ran 30 minutes diff --git a/modules/mesh-build-go/buildstep/pull.go b/modules/mesh-build-go/buildstep/pull.go index abbc9386b..c5229c60d 100644 --- a/modules/mesh-build-go/buildstep/pull.go +++ b/modules/mesh-build-go/buildstep/pull.go @@ -5,13 +5,13 @@ import ( "encoding/json" "errors" "fmt" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "sort" "strings" "sync" "time" + buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/pull_bus.go b/modules/mesh-build-go/buildstep/pull_bus.go index cbdafc71e..9f2a8f12a 100644 --- a/modules/mesh-build-go/buildstep/pull_bus.go +++ b/modules/mesh-build-go/buildstep/pull_bus.go @@ -3,10 +3,10 @@ package buildstep import ( "context" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "sync" "time" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "github.com/nats-io/nats.go/jetstream" ) diff --git a/modules/mesh-build-go/buildstep/pull_fake.go b/modules/mesh-build-go/buildstep/pull_fake.go index 3ba5766e8..ddefb2338 100644 --- a/modules/mesh-build-go/buildstep/pull_fake.go +++ b/modules/mesh-build-go/buildstep/pull_fake.go @@ -2,9 +2,10 @@ package buildstep import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "sync" "time" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // FakeAsks is a test double of a seat's workers for the build modules' unit tests: Publish puts an ask on a kind's diff --git a/modules/mesh-build-go/buildstep/pull_integration_test.go b/modules/mesh-build-go/buildstep/pull_integration_test.go index e8425771a..5fee7d300 100644 --- a/modules/mesh-build-go/buildstep/pull_integration_test.go +++ b/modules/mesh-build-go/buildstep/pull_integration_test.go @@ -4,7 +4,6 @@ package buildstep import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "strings" "sync" "testing" @@ -13,6 +12,7 @@ import ( "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/testbus" ) diff --git a/modules/mesh-build-go/buildstep/pull_seat.go b/modules/mesh-build-go/buildstep/pull_seat.go index 7c466420b..9441618b7 100644 --- a/modules/mesh-build-go/buildstep/pull_seat.go +++ b/modules/mesh-build-go/buildstep/pull_seat.go @@ -2,9 +2,9 @@ package buildstep import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "time" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/pull_seat_test.go b/modules/mesh-build-go/buildstep/pull_seat_test.go index aa1c7bdd7..e72422645 100644 --- a/modules/mesh-build-go/buildstep/pull_seat_test.go +++ b/modules/mesh-build-go/buildstep/pull_seat_test.go @@ -2,10 +2,10 @@ package buildstep import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "testing" "time" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/pull_test.go b/modules/mesh-build-go/buildstep/pull_test.go index 999af3855..5e2503719 100644 --- a/modules/mesh-build-go/buildstep/pull_test.go +++ b/modules/mesh-build-go/buildstep/pull_test.go @@ -5,8 +5,6 @@ import ( "encoding/json" "errors" "fmt" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" @@ -15,6 +13,8 @@ import ( "testing" "time" + buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/buildstep/seat_tools_test.go b/modules/mesh-build-go/buildstep/seat_tools_test.go index ab87f8ad6..5d04a5862 100644 --- a/modules/mesh-build-go/buildstep/seat_tools_test.go +++ b/modules/mesh-build-go/buildstep/seat_tools_test.go @@ -2,9 +2,10 @@ package buildstep import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "testing" "time" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // 1887/A9a, ADR 0525 §10: a build seat's verbs are .current, .pause and .resume; current names the ask running, diff --git a/modules/mesh-build-go/buildstep/step.go b/modules/mesh-build-go/buildstep/step.go index 7062030d5..c145958ff 100644 --- a/modules/mesh-build-go/buildstep/step.go +++ b/modules/mesh-build-go/buildstep/step.go @@ -9,10 +9,10 @@ import ( "encoding/json" "errors" "fmt" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" "log" "time" + buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) diff --git a/modules/mesh-build-go/buildstep/step_test.go b/modules/mesh-build-go/buildstep/step_test.go index fe7b0f8f2..a2a19cd2c 100644 --- a/modules/mesh-build-go/buildstep/step_test.go +++ b/modules/mesh-build-go/buildstep/step_test.go @@ -4,11 +4,12 @@ import ( "context" "encoding/json" "errors" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "sync" "testing" "time" + + buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // keys is a steps state in memory: every value put, in order, per key, and a signal for each end. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/archive_test.go b/modules/mesh-build-go/cmd/mesh-build-go/archive_test.go index ab1296673..9df531908 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/archive_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/archive_test.go @@ -6,7 +6,6 @@ import ( "context" "crypto/sha256" "encoding/hex" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "io" "net" "net/http" @@ -16,6 +15,8 @@ import ( "runtime" "strings" "testing" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // Issue 1589: the build step packs an archive artifact (novox/hq ADR 0478 §1), as the build agent packs it diff --git a/modules/mesh-build-go/cmd/mesh-build-go/asks.go b/modules/mesh-build-go/cmd/mesh-build-go/asks.go index 175eb687c..cfe30196d 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/asks.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/asks.go @@ -4,13 +4,13 @@ import ( "context" "encoding/json" "fmt" - checkerseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" "path/filepath" "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + checkerseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshdeliverychecker" + seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/asks_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/asks_integration_test.go index 724d5f464..6272dbfb8 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/asks_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/asks_integration_test.go @@ -4,7 +4,6 @@ package main import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "sync" "testing" "time" @@ -13,6 +12,7 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/testbus" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/beside_digest_test.go b/modules/mesh-build-go/cmd/mesh-build-go/beside_digest_test.go index b3c90d921..0f7b0f514 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/beside_digest_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/beside_digest_test.go @@ -2,12 +2,13 @@ package main import ( "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "slices" "strings" "testing" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // writeSiblings records the siblings the fetch placed, as the fetch does. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/build.go b/modules/mesh-build-go/cmd/mesh-build-go/build.go index 512634d42..c50fe1533 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/build.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/build.go @@ -9,12 +9,12 @@ package main import ( "context" "fmt" - builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "os" "path/filepath" "strings" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/build_test.go b/modules/mesh-build-go/cmd/mesh-build-go/build_test.go index c92812b35..16461569f 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/build_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/build_test.go @@ -7,7 +7,6 @@ import ( "crypto/sha256" "encoding/hex" "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "io" "os" "path/filepath" @@ -15,6 +14,7 @@ import ( "strings" "testing" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/candidate_test.go b/modules/mesh-build-go/cmd/mesh-build-go/candidate_test.go index 640e4142b..c18ea5452 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/candidate_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/candidate_test.go @@ -3,13 +3,13 @@ package main import ( "context" "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "slices" "strings" "testing" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/compose.go b/modules/mesh-build-go/cmd/mesh-build-go/compose.go index 3a8155c3d..1a81557c3 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/compose.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/compose.go @@ -17,7 +17,6 @@ import ( "encoding/json" "errors" "fmt" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" "io" "os" "path/filepath" @@ -27,6 +26,7 @@ import ( "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" + catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-delivery/sdk/composer" stdio "git.novox.be/novox/mesh-sdk/go" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go index 72b6b442a..4bee95dbf 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go @@ -5,7 +5,6 @@ package main import ( "context" "encoding/json" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" "io/fs" "os" "os/exec" @@ -18,6 +17,7 @@ import ( "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-delivery/sdk/composer" "git.novox.be/novox/mesh-sdk/go/forgekey" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go b/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go index 3f01603ec..c4a56907d 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go @@ -4,8 +4,6 @@ import ( "context" "encoding/json" "errors" - catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" - meshcat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" "os" "path/filepath" "slices" @@ -13,6 +11,8 @@ import ( "testing" "time" + catalogclient "git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient" + meshcat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog" sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-delivery/sdk/composer" "git.novox.be/novox/mesh-sdk/go/forgekey" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/digest.go b/modules/mesh-build-go/cmd/mesh-build-go/digest.go index 961457a3c..6a85a7ae6 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/digest.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/digest.go @@ -13,8 +13,6 @@ import ( "encoding/json" "errors" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" - trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" "io" "io/fs" "os" @@ -23,6 +21,9 @@ import ( "sort" "strconv" "strings" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" + trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" ) // DigestVersion is the form of the digest's text: changed whenever what the digest hashes changes in kind. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/fetch_test.go b/modules/mesh-build-go/cmd/mesh-build-go/fetch_test.go index 9f4ae2d1b..e01fd9b45 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/fetch_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/fetch_test.go @@ -3,7 +3,6 @@ package main import ( "context" "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" @@ -11,6 +10,7 @@ import ( "testing" "time" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/gopackage.go b/modules/mesh-build-go/cmd/mesh-build-go/gopackage.go index fb60b04fa..dbeaf4bee 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/gopackage.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/gopackage.go @@ -13,7 +13,6 @@ import ( "crypto/sha256" "encoding/hex" "fmt" - builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "io" "os" "path/filepath" @@ -23,6 +22,7 @@ import ( "golang.org/x/mod/module" modzip "golang.org/x/mod/zip" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/imports.go b/modules/mesh-build-go/cmd/mesh-build-go/imports.go index a19a61d84..e9ea32a9a 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/imports.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/imports.go @@ -9,12 +9,12 @@ package main import ( "context" "fmt" - trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" "os" "path/filepath" "slices" "strings" + trunk "git.novox.be/novox/mesh-delivery/sdk/trunk" "git.novox.be/novox/mesh-sdk/go/catalogue" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/installed_toolchain_test.go b/modules/mesh-build-go/cmd/mesh-build-go/installed_toolchain_test.go index 75d952dff..218e34a4d 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/installed_toolchain_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/installed_toolchain_test.go @@ -2,7 +2,6 @@ package main import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "reflect" @@ -13,6 +12,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/buildcpu" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/integration_level_test.go b/modules/mesh-build-go/cmd/mesh-build-go/integration_level_test.go index c4e85e65a..e2cf5bad1 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/integration_level_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/integration_level_test.go @@ -3,7 +3,6 @@ package main import ( "context" "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "net/url" "os" "path/filepath" @@ -12,6 +11,7 @@ import ( "testing" "time" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/isolate_test.go b/modules/mesh-build-go/cmd/mesh-build-go/isolate_test.go index 4588f7297..190224d77 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/isolate_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/isolate_test.go @@ -4,7 +4,6 @@ import ( "context" "encoding/json" "errors" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "path/filepath" "slices" "strings" @@ -12,6 +11,7 @@ import ( "testing" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go b/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go index c89199a44..73fa84288 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go @@ -2,11 +2,11 @@ package main import ( "context" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" "testing" "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/conformance" + buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/level.go b/modules/mesh-build-go/cmd/mesh-build-go/level.go index b58001efb..d61907753 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/level.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/level.go @@ -10,7 +10,6 @@ import ( "context" "encoding/json" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "os/exec" "path/filepath" @@ -18,6 +17,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // levelArg is the first argument that makes this binary a step's shut-off process: the integration level's, and, when diff --git a/modules/mesh-build-go/cmd/mesh-build-go/main.go b/modules/mesh-build-go/cmd/mesh-build-go/main.go index a20113d2d..2e1fae05e 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/main.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/main.go @@ -8,13 +8,13 @@ package main import ( "context" "fmt" - seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "os/user" "strings" "time" + seat "git.novox.be/novox/mesh-delivery/contracts/go/seats/nodebuildgo" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/mirror_test.go b/modules/mesh-build-go/cmd/mesh-build-go/mirror_test.go index 69595b3b0..6b5c39202 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/mirror_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/mirror_test.go @@ -3,8 +3,6 @@ package main import ( "encoding/json" "fmt" - "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "os/exec" "path/filepath" @@ -12,6 +10,9 @@ import ( "sync" "testing" "time" + + "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) func fetchOnce(t *testing.T, m *Module, states *keptStates, args map[string]any) FetchResult { diff --git a/modules/mesh-build-go/cmd/mesh-build-go/module.go b/modules/mesh-build-go/cmd/mesh-build-go/module.go index a09a976b7..75bd3cff2 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/module.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/module.go @@ -4,12 +4,12 @@ import ( "context" "encoding/json" "fmt" - buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" "net/http" "sync" "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + buildrun "git.novox.be/novox/mesh-delivery/sdk/buildrun" sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" "git.novox.be/novox/mesh-sdk/go/health" diff --git a/modules/mesh-build-go/cmd/mesh-build-go/module_test.go b/modules/mesh-build-go/cmd/mesh-build-go/module_test.go index 162237da0..e099f16e4 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/module_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/module_test.go @@ -4,13 +4,13 @@ import ( "context" "encoding/json" "errors" - buildstep "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "strings" "sync" "testing" "time" + buildstep "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/narrow_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/narrow_integration_test.go index cdc9491da..d7e684fed 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/narrow_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/narrow_integration_test.go @@ -3,11 +3,12 @@ package main import ( - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" "testing" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // ADR 0499 §4 (issue 1758): a fetch asked with the module's directory and its named paths leaves the workspace holding diff --git a/modules/mesh-build-go/cmd/mesh-build-go/needtools_test.go b/modules/mesh-build-go/cmd/mesh-build-go/needtools_test.go index 63b07e738..e39595e3c 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/needtools_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/needtools_test.go @@ -1,10 +1,11 @@ package main import ( - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "slices" "strings" "testing" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // Issue 1309: a test that runs a step in bubblewrap is proof only where it runs. Where a build module judges (it hands diff --git a/modules/mesh-build-go/cmd/mesh-build-go/node_toolchains_test.go b/modules/mesh-build-go/cmd/mesh-build-go/node_toolchains_test.go index 332a82166..a1f37d054 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/node_toolchains_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/node_toolchains_test.go @@ -3,13 +3,13 @@ package main import ( "context" "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "slices" "strconv" "testing" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/pins_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/pins_integration_test.go index c3aeebd2c..d19157869 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/pins_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/pins_integration_test.go @@ -8,11 +8,12 @@ package main import ( "context" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "os/exec" "path/filepath" "testing" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // 1148/AC2 as issue 1585 S15 has it (novox/hq ADR 0573 §4): given a forge with a mesh-sdk-like pull request whose branch diff --git a/modules/mesh-build-go/cmd/mesh-build-go/pins_test.go b/modules/mesh-build-go/cmd/mesh-build-go/pins_test.go index 710668068..75a5085af 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/pins_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/pins_test.go @@ -3,7 +3,6 @@ package main import ( "context" "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "os/exec" "path/filepath" @@ -11,6 +10,7 @@ import ( "sync" "testing" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/preview_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/preview_integration_test.go index c24e7210e..95cccd6c7 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/preview_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/preview_integration_test.go @@ -7,7 +7,6 @@ package main import ( "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "os/exec" "path/filepath" @@ -16,6 +15,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) func git(t *testing.T, dir string, args ...string) string { diff --git a/modules/mesh-build-go/cmd/mesh-build-go/preview_test.go b/modules/mesh-build-go/cmd/mesh-build-go/preview_test.go index 27f0f49b5..87ff97f0c 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/preview_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/preview_test.go @@ -5,12 +5,12 @@ import ( "crypto/sha256" "encoding/hex" "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" "testing" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/publish_test.go b/modules/mesh-build-go/cmd/mesh-build-go/publish_test.go index 7a59a594f..4f5a587d9 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/publish_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/publish_test.go @@ -8,8 +8,6 @@ import ( "encoding/hex" "encoding/json" "errors" - builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" @@ -17,6 +15,8 @@ import ( "testing" registry "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // pushed are the blobs the fake artifact store took, by digest, for the tests that read an archive back. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/read.go b/modules/mesh-build-go/cmd/mesh-build-go/read.go index 22b6c2d9d..57c298779 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/read.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/read.go @@ -7,8 +7,6 @@ package main import ( "encoding/json" "fmt" - buildstep "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "log" "sort" "strconv" @@ -16,6 +14,8 @@ import ( "sync" "time" + buildstep "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" stdio "git.novox.be/novox/mesh-sdk/go" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/read_test.go b/modules/mesh-build-go/cmd/mesh-build-go/read_test.go index 21edf59c4..b83f60e03 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/read_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/read_test.go @@ -4,13 +4,14 @@ import ( "context" "encoding/json" "fmt" - buildstep "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "slices" "strings" "sync/atomic" "testing" "time" + + buildstep "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // fakeState is a state as stored: key to raw value. diff --git a/modules/mesh-build-go/cmd/mesh-build-go/room_test.go b/modules/mesh-build-go/cmd/mesh-build-go/room_test.go index 239641493..3e65c8686 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/room_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/room_test.go @@ -2,7 +2,6 @@ package main import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" @@ -10,6 +9,7 @@ import ( "time" "git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" "git.novox.be/novox/mesh-sdk/go/health" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/selected_dirs_test.go b/modules/mesh-build-go/cmd/mesh-build-go/selected_dirs_test.go index 5e1c54b0d..77e8915e9 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/selected_dirs_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/selected_dirs_test.go @@ -3,13 +3,14 @@ package main import ( "encoding/json" "fmt" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" "sync" "testing" "time" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // threeModules gives the workspace three go.mod directories, a, b and c, whose modules are fixture/a, fixture/b and diff --git a/modules/mesh-build-go/cmd/mesh-build-go/store_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/store_integration_test.go index 67b093a16..2bf8e34e1 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/store_integration_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/store_integration_test.go @@ -9,7 +9,6 @@ import ( "encoding/hex" "encoding/json" "fmt" - builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "io" "net/http" "net/http/httptest" @@ -25,6 +24,7 @@ import ( _ "github.com/distribution/distribution/v3/registry/storage/driver/inmemory" registry "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" "git.novox.be/novox/mesh-sdk/go/catalogue" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/test_test.go b/modules/mesh-build-go/cmd/mesh-build-go/test_test.go index ed7d98477..bd241bb20 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/test_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/test_test.go @@ -3,13 +3,13 @@ package main import ( "context" "encoding/json" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" "testing" "time" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/versions_test.go b/modules/mesh-build-go/cmd/mesh-build-go/versions_test.go index 460bb75e6..958a5a34c 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/versions_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/versions_test.go @@ -3,13 +3,13 @@ package main import ( "context" "encoding/json" - builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "os" "path/filepath" "strings" "testing" + builds "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds" + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "git.novox.be/novox/mesh-sdk/go/forgekey" ) diff --git a/modules/mesh-build-go/cmd/mesh-build-go/xz_test.go b/modules/mesh-build-go/cmd/mesh-build-go/xz_test.go index 54c7d6cd2..35ca8107b 100644 --- a/modules/mesh-build-go/cmd/mesh-build-go/xz_test.go +++ b/modules/mesh-build-go/cmd/mesh-build-go/xz_test.go @@ -2,13 +2,14 @@ package main import ( "context" - sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" "net" "net/http" "net/http/httptest" "os" "path/filepath" "testing" + + sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep" ) // releaseXzSHA256 is the sha256 of testdata/upstream-release.tar.xz: the tar stream of upstream-release.tar.gz,