Skip to content

Commit 10f3165

Browse files
authored
chore: avoid initializing macadam on windows (#1971)
Skips initializing macadam on Windows, since the function is unused (no overlap in bootc and macadam between supported disk images). Also skips adding the provider and monitoring machines. Fixes #1970. Signed-off-by: Tim deBoer <[email protected]>
1 parent c30b021 commit 10f3165

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

packages/backend/src/extension.ts

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { getErrorMessage, verifyContainerProivder } from './macadam/utils';
3232
import { LoggerDelegator } from './macadam/logger';
3333
import { ProviderConnectionShellAccessImpl } from './macadam/macadam-machine-stream';
3434
import { macadamName } from './constants';
35+
import { isWindows } from './machine-utils';
3536

3637
export const telemetryLogger = extensionApi.env.createTelemetryLogger();
3738

@@ -175,18 +176,20 @@ export async function activate(extensionContext: ExtensionContext): Promise<void
175176
}),
176177
);
177178

178-
macadam = new macadamJSPackage.Macadam(macadamName);
179-
try {
180-
await macadam.init();
181-
} catch (error) {
182-
console.error('Error initializing macadam', error);
183-
}
179+
if (!isWindows()) {
180+
macadam = new macadamJSPackage.Macadam(macadamName);
181+
try {
182+
await macadam.init();
183+
} catch (error) {
184+
console.error('Error initializing macadam', error);
185+
}
184186

185-
const provider = await createProvider(extensionContext);
187+
const provider = await createProvider(extensionContext);
186188

187-
monitorMachines(provider, extensionContext).catch((error: unknown) => {
188-
console.error('Error while monitoring machines', error);
189-
});
189+
monitorMachines(provider, extensionContext).catch((error: unknown) => {
190+
console.error('Error while monitoring machines', error);
191+
});
192+
}
190193
}
191194

192195
function checkVersion(version: string): boolean {

0 commit comments

Comments
 (0)