abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-19 09:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix E2E (#156)

Browse Source
This commit is contained in:
Yiheng Xu
2025-07-31 15:16:23 +08:00
committed by GitHub
parent 718f68d247
commit bb6db7e492
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/e2e.yml vendored
View File

@@ -44,5 +44,7 @@ jobs:
- name: Run E2E tests - name: Run E2E tests
env: env:
GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }} OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
OPENAI_BASE_URL: ${{ secrets.OPENAI_BASE_URL }}
OPENAI_MODEL: ${{ secrets.OPENAI_MODEL }}
run: npm run test:integration:${{ matrix.sandbox }} -- --verbose --keep-output run: npm run test:integration:${{ matrix.sandbox }} -- --verbose --keep-output

26
packages/cli/src/gemini.tsx
View File

@@ -323,16 +323,34 @@ async function validateNonInterActiveAuth(
nonInteractiveConfig: Config, nonInteractiveConfig: Config,
) { ) {
// making a special case for the cli. many headless environments might not have a settings.json set // making a special case for the cli. many headless environments might not have a settings.json set
// so if GEMINI_API_KEY is set, we'll use that. However since the oauth things are interactive anyway, we'll // so if GEMINI_API_KEY or OPENAI_API_KEY is set, we'll use that. However since the oauth things are interactive anyway, we'll
// still expect that exists // still expect that exists
if (!selectedAuthType && !process.env.GEMINI_API_KEY) { if (
!selectedAuthType &&
!process.env.GEMINI_API_KEY &&
!process.env.OPENAI_API_KEY
) {
console.error( console.error(
`Please set an Auth method in your ${USER_SETTINGS_PATH} OR specify GEMINI_API_KEY env variable file before running`, `Please set an Auth method in your ${USER_SETTINGS_PATH} OR specify GEMINI_API_KEY or OPENAI_API_KEY env variable before running`,
); );
process.exit(1); process.exit(1);
} }
selectedAuthType = selectedAuthType || AuthType.USE_GEMINI; // Determine auth type based on available environment variables
if (!selectedAuthType) {
if (process.env.OPENAI_API_KEY) {
selectedAuthType = AuthType.USE_OPENAI;
} else if (process.env.GEMINI_API_KEY) {
selectedAuthType = AuthType.USE_GEMINI;
}
}
// This should never happen due to the check above, but TypeScript needs assurance
if (!selectedAuthType) {
console.error('No valid authentication method found');
process.exit(1);
}
const err = validateAuthMethod(selectedAuthType); const err = validateAuthMethod(selectedAuthType);
if (err != null) { if (err != null) {
console.error(err); console.error(err);