Merge branch 'main' into fix/brave_api
This commit is contained in:
commit
3c9be6942a
@ -72,6 +72,7 @@ Status: unreleased.
|
|||||||
- Security: pin npm overrides to keep tar@7.5.4 for install toolchains.
|
- Security: pin npm overrides to keep tar@7.5.4 for install toolchains.
|
||||||
- Security: properly test Windows ACL audit for config includes. (#2403) Thanks @dominicnunez.
|
- Security: properly test Windows ACL audit for config includes. (#2403) Thanks @dominicnunez.
|
||||||
- CLI: recognize versioned Node executables when parsing argv. (#2490) Thanks @David-Marsh-Photo.
|
- CLI: recognize versioned Node executables when parsing argv. (#2490) Thanks @David-Marsh-Photo.
|
||||||
|
- CLI: avoid prompting for gateway runtime under the spinner. (#2874)
|
||||||
- BlueBubbles: coalesce inbound URL link preview messages. (#1981) Thanks @tyler6204.
|
- BlueBubbles: coalesce inbound URL link preview messages. (#1981) Thanks @tyler6204.
|
||||||
- Cron: allow payloads containing "heartbeat" in event filter. (#2219) Thanks @dwfinkelstein.
|
- Cron: allow payloads containing "heartbeat" in event filter. (#2219) Thanks @dwfinkelstein.
|
||||||
- CLI: avoid loading config for global help/version while registering plugin commands. (#2212) Thanks @dial481.
|
- CLI: avoid loading config for global help/version while registering plugin commands. (#2212) Thanks @dial481.
|
||||||
|
|||||||
@ -25,7 +25,7 @@ const isWindows = process.platform === "win32" || process.env.RUNNER_OS === "Win
|
|||||||
const isWindowsCi = isCI && isWindows;
|
const isWindowsCi = isCI && isWindows;
|
||||||
const shardOverride = Number.parseInt(process.env.CLAWDBOT_TEST_SHARDS ?? "", 10);
|
const shardOverride = Number.parseInt(process.env.CLAWDBOT_TEST_SHARDS ?? "", 10);
|
||||||
const shardCount = isWindowsCi ? (Number.isFinite(shardOverride) && shardOverride > 1 ? shardOverride : 2) : 1;
|
const shardCount = isWindowsCi ? (Number.isFinite(shardOverride) && shardOverride > 1 ? shardOverride : 2) : 1;
|
||||||
const windowsCiArgs = isWindowsCi ? ["--pool", "threads", "--no-file-parallelism"] : [];
|
const windowsCiArgs = isWindowsCi ? ["--no-file-parallelism", "--dangerouslyIgnoreUnhandledErrors"] : [];
|
||||||
const overrideWorkers = Number.parseInt(process.env.CLAWDBOT_TEST_WORKERS ?? "", 10);
|
const overrideWorkers = Number.parseInt(process.env.CLAWDBOT_TEST_WORKERS ?? "", 10);
|
||||||
const resolvedOverride = Number.isFinite(overrideWorkers) && overrideWorkers > 0 ? overrideWorkers : null;
|
const resolvedOverride = Number.isFinite(overrideWorkers) && overrideWorkers > 0 ? overrideWorkers : null;
|
||||||
const parallelRuns = isWindowsCi ? [] : runs.filter((entry) => entry.name !== "gateway");
|
const parallelRuns = isWindowsCi ? [] : runs.filter((entry) => entry.name !== "gateway");
|
||||||
|
|||||||
@ -66,20 +66,23 @@ export async function maybeInstallDaemon(params: {
|
|||||||
|
|
||||||
if (shouldInstall) {
|
if (shouldInstall) {
|
||||||
let installError: string | null = null;
|
let installError: string | null = null;
|
||||||
|
if (!params.daemonRuntime) {
|
||||||
|
if (GATEWAY_DAEMON_RUNTIME_OPTIONS.length === 1) {
|
||||||
|
daemonRuntime = GATEWAY_DAEMON_RUNTIME_OPTIONS[0]?.value ?? DEFAULT_GATEWAY_DAEMON_RUNTIME;
|
||||||
|
} else {
|
||||||
|
daemonRuntime = guardCancel(
|
||||||
|
await select({
|
||||||
|
message: "Gateway service runtime",
|
||||||
|
options: GATEWAY_DAEMON_RUNTIME_OPTIONS,
|
||||||
|
initialValue: DEFAULT_GATEWAY_DAEMON_RUNTIME,
|
||||||
|
}),
|
||||||
|
params.runtime,
|
||||||
|
) as GatewayDaemonRuntime;
|
||||||
|
}
|
||||||
|
}
|
||||||
await withProgress(
|
await withProgress(
|
||||||
{ label: "Gateway service", indeterminate: true, delayMs: 0 },
|
{ label: "Gateway service", indeterminate: true, delayMs: 0 },
|
||||||
async (progress) => {
|
async (progress) => {
|
||||||
if (!params.daemonRuntime) {
|
|
||||||
daemonRuntime = guardCancel(
|
|
||||||
await select({
|
|
||||||
message: "Gateway service runtime",
|
|
||||||
options: GATEWAY_DAEMON_RUNTIME_OPTIONS,
|
|
||||||
initialValue: DEFAULT_GATEWAY_DAEMON_RUNTIME,
|
|
||||||
}),
|
|
||||||
params.runtime,
|
|
||||||
) as GatewayDaemonRuntime;
|
|
||||||
}
|
|
||||||
|
|
||||||
progress.setLabel("Preparing Gateway service…");
|
progress.setLabel("Preparing Gateway service…");
|
||||||
|
|
||||||
const cfg = loadConfig();
|
const cfg = loadConfig();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user