mirror of
https://github.com/QwenLM/qwen-code.git
synced 2025-12-20 16:57:46 +00:00
Merge tag 'v0.1.15' into feature/yiheng/sync-gemini-cli-0.1.15
This commit is contained in:
@@ -99,7 +99,7 @@ async function shouldUseCurrentUserInSandbox(): Promise<boolean> {
|
||||
}
|
||||
|
||||
// docker does not allow container names to contain ':' or '/', so we
|
||||
// parse those out and make the name a little shorter
|
||||
// parse those out to shorten the name
|
||||
function parseImageName(image: string): string {
|
||||
const [fullName, tag] = image.split(':');
|
||||
const name = fullName.split('/').at(-1) ?? 'unknown-image';
|
||||
@@ -187,7 +187,7 @@ export async function start_sandbox(
|
||||
if (config.command === 'sandbox-exec') {
|
||||
// disallow BUILD_SANDBOX
|
||||
if (process.env.BUILD_SANDBOX) {
|
||||
console.error('ERROR: cannot BUILD_SANDBOX when using MacOS Seatbelt');
|
||||
console.error('ERROR: cannot BUILD_SANDBOX when using macOS Seatbelt');
|
||||
process.exit(1);
|
||||
}
|
||||
const profile = (process.env.SEATBELT_PROFILE ??= 'permissive-open');
|
||||
@@ -536,6 +536,14 @@ export async function start_sandbox(
|
||||
);
|
||||
}
|
||||
|
||||
// copy GOOGLE_GENAI_USE_GCA
|
||||
if (process.env.GOOGLE_GENAI_USE_GCA) {
|
||||
args.push(
|
||||
'--env',
|
||||
`GOOGLE_GENAI_USE_GCA=${process.env.GOOGLE_GENAI_USE_GCA}`,
|
||||
);
|
||||
}
|
||||
|
||||
// copy GOOGLE_CLOUD_PROJECT
|
||||
if (process.env.GOOGLE_CLOUD_PROJECT) {
|
||||
args.push(
|
||||
@@ -858,7 +866,7 @@ async function ensureSandboxImageIsPresent(
|
||||
|
||||
console.info(`Sandbox image ${image} not found locally.`);
|
||||
if (image === LOCAL_DEV_SANDBOX_IMAGE_NAME) {
|
||||
// user needs to build the image themself
|
||||
// user needs to build the image themselves
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user