Skip to content

Commit 282516a

Browse files
committed
Trying to fix failing test
1 parent 7364047 commit 282516a

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

.github/workflows/integration-tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ jobs:
3838
- name: Run linting
3939
run: npm run lint
4040

41+
- name: Run workspace out of tree integration tests
42+
run: |
43+
xvfb-run -a node scripts/run-integration-tests.js out-of-tree
44+
env:
45+
NODE_ENV: test
46+
ZEPHYR_BASE: /tmp/zephyr
47+
4148
- name: Run standard workflow integration tests
4249
run: |
4350
xvfb-run -a node scripts/run-integration-tests.js standard
@@ -65,10 +72,3 @@ jobs:
6572
env:
6673
NODE_ENV: test
6774
ZEPHYR_BASE: /tmp/zephyr
68-
69-
- name: Run workspace out of tree integration tests
70-
run: |
71-
xvfb-run -a node scripts/run-integration-tests.js out-of-tree
72-
env:
73-
NODE_ENV: test
74-
ZEPHYR_BASE: /tmp/zephyr

src/setup_utilities/workspace-setup.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ export async function workspaceSetupStandard(context: vscode.ExtensionContext, w
307307
* Handle external installation configuration and setup
308308
*/
309309
async function handleExternalInstallation(
310-
context: vscode.ExtensionContext,
311-
wsConfig: WorkspaceConfig,
312-
globalConfig: GlobalConfig,
310+
context: vscode.ExtensionContext,
311+
wsConfig: WorkspaceConfig,
312+
globalConfig: GlobalConfig,
313313
westConfigResult: WestConfigResult
314314
): Promise<boolean> {
315315
const externalPath = westConfigResult.externalInstallPath!;
@@ -328,7 +328,7 @@ async function handleExternalInstallation(
328328
} else {
329329
vscode.window.showInformationMessage(`Workspace linked to external Zephyr installation at: ${externalPath}`);
330330
}
331-
331+
332332
return true;
333333
}
334334

@@ -788,6 +788,10 @@ export async function westConfig(
788788
case 'create-new-west-yml':
789789
// Run west selector to create new west.yml
790790
output.appendLine(`[WEST CONFIG] Running west selector to create new west.yml...`);
791+
// Ensure setup state is initialized so westSelector has a valid destination path
792+
if (!wsConfig.activeSetupState || !wsConfig.activeSetupState.setupPath) {
793+
await setSetupState(context, wsConfig, globalConfig, baseDir);
794+
}
791795
const westSelection = await westSelector(context, wsConfig);
792796
if (!westSelection || westSelection.failed) {
793797
return { cancelled: true, option: null };

0 commit comments

Comments
 (0)