fix
This commit is contained in:
@@ -16,9 +16,11 @@
|
||||
// Off by default, deliberately: it serves /download/* and proxies /dhp, so it is the one
|
||||
// step that interrupts the road everything else publishes over.
|
||||
let withMcp = $state(false);
|
||||
// The browser client at web.odian.fr. Built from _WEB in the Engine checkout, in Docker.
|
||||
let withWeb = $state(false);
|
||||
|
||||
async function release() {
|
||||
await launcher.releaseRun(password, withApi, withMcp);
|
||||
await launcher.releaseRun(password, withApi, withMcp, withWeb);
|
||||
password = ""; // held for the one run, never kept
|
||||
}
|
||||
|
||||
@@ -194,6 +196,13 @@
|
||||
<em>— every operator is logged out</em>
|
||||
</span>
|
||||
</label>
|
||||
<label class="check">
|
||||
<input type="checkbox" bind:checked={withWeb} disabled={!plan.docker || busy} />
|
||||
<span>
|
||||
Also deploy ODIAN WEB{plan.docker ? "" : " — needs Docker"}
|
||||
<em>— web.odian.fr, from the Engine checkout</em>
|
||||
</span>
|
||||
</label>
|
||||
<label class="check">
|
||||
<input type="checkbox" bind:checked={withMcp} disabled={!plan.docker || busy} />
|
||||
<span>
|
||||
|
||||
+2
-1
@@ -73,7 +73,8 @@ function createTauriBackend(): Backend {
|
||||
onStatus: (handler) => subscribe<Status>("status", handler),
|
||||
onInstallProgress: (handler) => subscribe<InstallProgress>("install-progress", handler),
|
||||
releasePlan: () => invoke<ReleasePlan>("release_plan"),
|
||||
releaseRun: (password, withApi, withMcp) => invoke<void>("release_run", { password, withApi, withMcp }),
|
||||
releaseRun: (password, withApi, withMcp, withWeb) =>
|
||||
invoke<void>("release_run", { password, withApi, withMcp, withWeb }),
|
||||
releaseConsole: (since) => invoke<ReleaseConsoleTail>("release_console", { since }),
|
||||
refreshRun: (password, pgPassword, tileRoot) => invoke<void>("refresh_run", { password, pgPassword, tileRoot }),
|
||||
onTileSyncProgress: (handler) => subscribe<TileSyncProgress>("tile-sync-progress", handler),
|
||||
|
||||
@@ -420,9 +420,9 @@ class Launcher {
|
||||
});
|
||||
}
|
||||
|
||||
releaseRun(password: string, withApi: boolean, withMcp: boolean) {
|
||||
releaseRun(password: string, withApi: boolean, withMcp: boolean, withWeb: boolean) {
|
||||
return this.run("release", async () => {
|
||||
await backend.releaseRun(password, withApi, withMcp);
|
||||
await backend.releaseRun(password, withApi, withMcp, withWeb);
|
||||
this.releaseOpen = false;
|
||||
// Straight into the console: the release is running with nowhere else to show itself.
|
||||
this.consoleLines = [];
|
||||
|
||||
+4
-2
@@ -814,6 +814,8 @@ class MockBackend implements Backend {
|
||||
dirty: false, note: "what is published does not say which commit it came from" },
|
||||
{ key: "mcp", title: "MCP server", live: null, commit: "c7d8e9f", behind: null,
|
||||
dirty: false, note: "the script asks the node whether it is already running this commit" },
|
||||
{ key: "web", title: "ODIAN WEB", live: "0.1.7", commit: "a1b2c3d", behind: null,
|
||||
dirty: false, note: "web.odian.fr; the script asks whether it already serves this commit" },
|
||||
],
|
||||
// The real numbers from pack 0.72.0, so the panel can be judged on what it will show.
|
||||
data: {
|
||||
@@ -831,7 +833,7 @@ class MockBackend implements Backend {
|
||||
};
|
||||
}
|
||||
|
||||
async releaseRun(password: string, withApi: boolean, withMcp: boolean): Promise<void> {
|
||||
async releaseRun(password: string, withApi: boolean, withMcp: boolean, withWeb: boolean): Promise<void> {
|
||||
await this.wait(400);
|
||||
if (!password.trim()) throw "The node's sudo password is needed to cut a pack and to roll the API.";
|
||||
// Nothing runs in the browser, so play a short script into the console instead: enough
|
||||
@@ -842,7 +844,7 @@ class MockBackend implements Backend {
|
||||
"engine at 1255873...",
|
||||
"Nothing that ships has changed. No pack cut.",
|
||||
"pack: nothing to release",
|
||||
`=== Launcher 0.1.40 === (API ${withApi}, MCP ${withMcp})`,
|
||||
`=== Launcher 0.1.40 === (API ${withApi}, MCP ${withMcp}, web ${withWeb})`,
|
||||
"npx tauri build ...",
|
||||
"Release finished.",
|
||||
];
|
||||
|
||||
+1
-1
@@ -412,7 +412,7 @@ export interface Backend {
|
||||
/** Take the tiles the DHP baked while this PC was away. */
|
||||
syncTiles(): Promise<void>;
|
||||
releasePlan(): Promise<ReleasePlan>;
|
||||
releaseRun(password: string, withApi: boolean, withMcp: boolean): Promise<void>;
|
||||
releaseRun(password: string, withApi: boolean, withMcp: boolean, withWeb: boolean): Promise<void>;
|
||||
releaseConsole(since: number): Promise<ReleaseConsoleTail>;
|
||||
/** Rebuild the pack's data payload. Prepares inputs only; it publishes nothing. */
|
||||
refreshRun(password: string, pgPassword: string, tileRoot: string): Promise<void>;
|
||||
|
||||
Reference in New Issue
Block a user