mirror of
https://github.com/multica-ai/multica.git
synced 2026-07-12 12:18:55 +02:00
#5057 restricted version derivation to `git describe --tags --match 'v[0-9]*'`, but the command was passed to `execSync` as a shell string. On Windows the shell is cmd.exe, which does not strip the POSIX single quotes around 'v[0-9]*', so git received the quotes literally, matched no tag, fell through to `--always`, and the version degraded to the `0.0.0-g<hash>` fallback. That is what shipped a `0.0.0-gc05b67ae4` Windows Desktop build (electron-builder `--publish always` then auto-created a bogus release) during the v0.3.41 release, even though the tag was sitting exactly on HEAD. Linux/macOS were unaffected because /bin/sh strips the quotes. Fix: invoke git with an argv array via execFileSync in every version-derivation path, so the match pattern reaches git as one literal argument regardless of platform: - apps/desktop/scripts/package.mjs (Desktop version → electron-builder) - apps/desktop/scripts/bundle-cli.mjs (bundled CLI ldflags version) - apps/desktop/src/main/app-version.ts (dev-mode version fallback) The Makefile is intentionally left as-is: make's `$(shell ...)` always runs via /bin/sh (even on Windows) and the CLI release runs on Linux, so its single quotes are stripped correctly. Tests: export `deriveVersion` and `DESCRIBE_ARGS` and add coverage that runs the real `git describe` against throwaway repos (clean semver tag, semver tag chosen over a nearer non-semver tag, and the no-tag fallback), plus a structural check that the match pattern is a bare argv token with no embedded quotes. The prior suite only unit-tested the `normalizeGitVersion` string transform, which is why this slipped through. MUL-4256 Co-authored-by: J <j@multica.ai> Co-authored-by: multica-agent <github@multica.ai>
176 lines
5.3 KiB
JavaScript
176 lines
5.3 KiB
JavaScript
#!/usr/bin/env node
|
|
// Builds the `multica` CLI from server/cmd/multica and copies the binary
|
|
// into apps/desktop/resources/bin/ so electron-vite (dev) and electron-
|
|
// builder (prod) pick it up. Running this on every dev/build/package
|
|
// invocation guarantees the bundled CLI always matches the current Go
|
|
// source — no more stale binary surprises. Go's build cache makes the
|
|
// no-op case (nothing changed) effectively free.
|
|
//
|
|
// ldflags mirror `make build` so `multica --version` reports a meaningful
|
|
// version / commit / date.
|
|
//
|
|
// Graceful: if `go` is not installed (e.g. frontend-only contributor), we
|
|
// skip the build and fall through to auto-install at runtime. A genuine
|
|
// Go compile error is fatal — you want that to block dev, not hide.
|
|
|
|
import { access, chmod, copyFile, mkdir, rm } from "node:fs/promises";
|
|
import { constants } from "node:fs";
|
|
import { execFileSync, execSync } from "node:child_process";
|
|
import { dirname, join, resolve } from "node:path";
|
|
import { fileURLToPath } from "node:url";
|
|
|
|
const here = dirname(fileURLToPath(import.meta.url));
|
|
const repoRoot = resolve(here, "..", "..", "..");
|
|
const serverDir = join(repoRoot, "server");
|
|
|
|
const PLATFORM_TO_GOOS = {
|
|
darwin: "darwin",
|
|
linux: "linux",
|
|
win32: "windows",
|
|
};
|
|
|
|
const SUPPORTED_ARCHS = new Set(["x64", "arm64"]);
|
|
|
|
function runtimePlatformFromArgs(argv) {
|
|
const flagIndex = argv.indexOf("--target-platform");
|
|
if (flagIndex === -1) return process.platform;
|
|
return argv[flagIndex + 1] ?? "";
|
|
}
|
|
|
|
function runtimeArchFromArgs(argv) {
|
|
const flagIndex = argv.indexOf("--target-arch");
|
|
if (flagIndex === -1) return process.arch;
|
|
return argv[flagIndex + 1] ?? "";
|
|
}
|
|
|
|
function normalizeRuntimePlatform(platform) {
|
|
if (platform in PLATFORM_TO_GOOS) return platform;
|
|
throw new Error(
|
|
`[bundle-cli] unsupported target platform: ${platform}. ` +
|
|
"Use darwin, linux, or win32.",
|
|
);
|
|
}
|
|
|
|
function normalizeRuntimeArch(arch) {
|
|
if (SUPPORTED_ARCHS.has(arch)) return arch;
|
|
throw new Error(
|
|
`[bundle-cli] unsupported target architecture: ${arch}. ` +
|
|
"Use x64 or arm64.",
|
|
);
|
|
}
|
|
|
|
function binaryNameForPlatform(platform) {
|
|
return platform === "win32" ? "multica.exe" : "multica";
|
|
}
|
|
|
|
const targetPlatform = normalizeRuntimePlatform(
|
|
runtimePlatformFromArgs(process.argv.slice(2)),
|
|
);
|
|
const targetArch = normalizeRuntimeArch(runtimeArchFromArgs(process.argv.slice(2)));
|
|
const goos = PLATFORM_TO_GOOS[targetPlatform];
|
|
const goarch = targetArch === "x64" ? "amd64" : targetArch;
|
|
const binName = binaryNameForPlatform(targetPlatform);
|
|
const srcBinary = join(serverDir, "bin", `${goos}-${goarch}`, binName);
|
|
const destDir = join(repoRoot, "apps", "desktop", "resources", "bin");
|
|
const destBinary = join(destDir, binName);
|
|
|
|
// Hand git arguments straight to the binary (no shell). A match pattern like
|
|
// `v[0-9]*` must reach git as one literal argument; routing it through a shell
|
|
// string breaks on Windows, where cmd.exe keeps the POSIX single quotes and
|
|
// git matches no tag — degrading the bundled CLI's version to the
|
|
// 0.0.0-g<hash> fallback.
|
|
function git(...args) {
|
|
try {
|
|
return execFileSync("git", args, { encoding: "utf-8" }).trim();
|
|
} catch {
|
|
return "";
|
|
}
|
|
}
|
|
|
|
function hasGo() {
|
|
try {
|
|
execSync("go version", { stdio: "pipe" });
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
async function exists(p) {
|
|
try {
|
|
await access(p, constants.F_OK);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
if (hasGo()) {
|
|
const version =
|
|
git("describe", "--tags", "--match", "v[0-9]*", "--always", "--dirty") ||
|
|
"dev";
|
|
const commit = git("rev-parse", "--short", "HEAD") || "unknown";
|
|
const date = new Date().toISOString().replace(/\.\d+Z$/, "Z");
|
|
const ldflags = `-X main.version=${version} -X main.commit=${commit} -X main.date=${date}`;
|
|
|
|
console.log(
|
|
`[bundle-cli] go build → ${srcBinary} (${goos}/${goarch}, version=${version} commit=${commit})`,
|
|
);
|
|
await mkdir(join(serverDir, "bin", `${goos}-${goarch}`), { recursive: true });
|
|
execFileSync(
|
|
"go",
|
|
[
|
|
"build",
|
|
"-ldflags",
|
|
ldflags,
|
|
"-o",
|
|
srcBinary,
|
|
"./cmd/multica",
|
|
],
|
|
{
|
|
cwd: serverDir,
|
|
stdio: "inherit",
|
|
env: {
|
|
...process.env,
|
|
CGO_ENABLED: "0",
|
|
GOOS: goos,
|
|
GOARCH: goarch,
|
|
},
|
|
},
|
|
);
|
|
} else {
|
|
console.warn(
|
|
"[bundle-cli] `go` not found in PATH — skipping CLI build. " +
|
|
"Desktop will use whatever is already in resources/bin/, or fall back " +
|
|
"to auto-installing the latest release at runtime.",
|
|
);
|
|
}
|
|
|
|
if (!(await exists(srcBinary))) {
|
|
console.warn(
|
|
`[bundle-cli] ${srcBinary} not present — Desktop will fall back to ` +
|
|
`auto-installing the latest release at runtime.`,
|
|
);
|
|
await rm(destDir, { recursive: true, force: true });
|
|
process.exit(0);
|
|
}
|
|
|
|
await rm(destDir, { recursive: true, force: true });
|
|
await mkdir(destDir, { recursive: true });
|
|
await copyFile(srcBinary, destBinary);
|
|
await chmod(destBinary, 0o755);
|
|
|
|
// macOS: ad-hoc sign so Gatekeeper doesn't complain when the parent app
|
|
// (which itself may be unsigned in dev) spawns the child.
|
|
if (process.platform === "darwin") {
|
|
try {
|
|
execSync(`codesign -s - --force ${JSON.stringify(destBinary)}`, {
|
|
stdio: "pipe",
|
|
});
|
|
} catch {
|
|
// Non-fatal. Unsigned binaries still run when the parent app is trusted.
|
|
}
|
|
}
|
|
|
|
console.log(`[bundle-cli] bundled ${srcBinary} → ${destBinary}`);
|