Skip to content

Accept precompile as well as preload in the kernel's boot.json #10034

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

Closed
iHiD wants to merge 1 commit into from
Closed

Accept precompile as well as preload in the kernel's boot.json #10034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions app/javascript/components/editor/ClientSideTestRunner/kernel/Kernel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@ export class Kernel {
}
})

const { env, preload, licence } = self.config
await self.#client.boot(entry.sysroot, toEnv(env), preload, licence)
const { env, licence } = self.config
const precompile = self.config.precompile ?? self.config.preload ?? []
await self.#client.boot(entry.sysroot, toEnv(env), precompile, licence)

// The sysroot carries the language's tools but not the runner itself, so
// /opt/test-runner is untarred on top of it. Part of boot rather than of a
Expand Down
6 changes: 4 additions & 2 deletions app/javascript/components/editor/ClientSideTestRunner/kernel/kernelClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export interface KernelClient {
boot(
sysroot: string,
env: string[],
preload: string[],
precompile: string[],
licence?: Licence[]
): Request<void>
untar(path: string, data: ArrayBuffer): Request<void>
Expand All @@ -62,6 +62,8 @@ export type KernelClientConstructor = new (options: {
/** The kernel's boot.json, served beside sysroot.tar. */
export type BootConfig = {
env: Record<string, string>
preload: string[]
precompile?: string[]
// The old name for precompile. Remove once every boot.json uses precompile.
preload?: string[]
licence?: Licence[]
}
Loading