Skip to content

fix: unbreak CI — drop make -t-incompatible dist co-target + repair getServiceInterface call site #3393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dr-bonez merged 2 commits into from
Jul 3, 2026
+21 −18
Merged

fix: unbreak CI — drop make -t-incompatible dist co-target + repair getServiceInterface call site #3393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72be4cb
fix: revert start-core/SDK dist co-target — it breaks CI's make -t flow
helix-nine Jul 3, 2026
a185be2
fix: repair SystemForEmbassy call to removed getServiceInterface helper
helix-nine Jul 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions projects/start-os/container-runtime/src/Adapters/Systems/SystemForEmbassy/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,19 +1331,26 @@ async function updateConfig(
mutConfigValue[key] = ""
return
}
const filled = await utils
.getServiceInterface(effects, {
const filled = await (async () => {
const serviceInterface = await effects.getServiceInterface({
packageId: specValue["package-id"],
id: serviceInterfaceId,
serviceInterfaceId,
})
.once()
.catch((x) => {
console.error(
"Could not get the service interface",
utils.asError(x),
)
return null
if (!serviceInterface) return null
const host = await effects.getHostInfo({
packageId: specValue["package-id"],
hostId: serviceInterface.addressInfo.hostId,
})
return {
...serviceInterface,
addressInfo: host
? utils.filledAddress(host, serviceInterface.addressInfo)
: null,
}
})().catch((x) => {
console.error("Could not get the service interface", utils.asError(x))
return null
})
const catchFn = <X>(fn: () => X) => {
try {
return fn()
Expand Down
5 changes: 2 additions & 3 deletions projects/start-sdk/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ test-sdk: $(call ls-files, projects/start-sdk) shared-libs/ts-modules/start-core
$(MAKE) -C shared-libs/ts-modules/start-core test
cd projects/start-sdk && make test

# Co-target the bundled dist/node_modules stamp (see shared-libs/ts-modules/build.mk).
projects/start-sdk/dist/package.json projects/start-sdk/dist/node_modules/.package-lock.json &: $(call ls-files, projects/start-sdk) shared-libs/ts-modules/start-core/dist/package.json
projects/start-sdk/dist/package.json: $(call ls-files, projects/start-sdk) shared-libs/ts-modules/start-core/dist/package.json
(cd projects/start-sdk && make bundle)
touch projects/start-sdk/dist/package.json projects/start-sdk/dist/node_modules/.package-lock.json
touch projects/start-sdk/dist/package.json

.PHONY: clean-sdk
clean-sdk:
Expand Down
7 changes: 2 additions & 5 deletions shared-libs/ts-modules/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ COMPRESSED_WEB_UIS := projects/start-os/web/dist/static/ui/index.html projects/s

# start-core (the shared TS lib formerly start-sdk/base): web consumes its built
# dist via the root file: dep; the SDK and container-runtime consume it too.
# The bundled dist/node_modules stamp is a co-target so a missing/incomplete
# vendored node_modules forces a rebuild — otherwise an incremental build ships
# a dist whose compiled JS requires deps its node_modules lacks.
shared-libs/ts-modules/start-core/dist/package.json shared-libs/ts-modules/start-core/dist/node_modules/.package-lock.json &: $(call ls-files, shared-libs/ts-modules/start-core) shared-libs/ts-modules/start-core/lib/osBindings/index.ts
shared-libs/ts-modules/start-core/dist/package.json: $(call ls-files, shared-libs/ts-modules/start-core) shared-libs/ts-modules/start-core/lib/osBindings/index.ts
$(MAKE) -C shared-libs/ts-modules/start-core dist
touch shared-libs/ts-modules/start-core/dist/package.json shared-libs/ts-modules/start-core/dist/node_modules/.package-lock.json
touch shared-libs/ts-modules/start-core/dist/package.json

package-lock.json: package.json shared-libs/ts-modules/start-core/dist/package.json
npm --prefix . i
Expand Down