Skip to content

Commit 9b4c80f

Browse files
committed
fix(server): preserve device command context after merge
1 parent 146186c commit 9b4c80f

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

‎apps/server/src/device/LocalDeviceHost.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ it.effect("keeps local Android and iOS available without ffmpeg", () =>
655655
HOME: baseDir,
656656
PATH: `${baseDir}/bin`,
657657
ANDROID_HOME: `${baseDir}/sdk`,
658+
JAVA_HOME: "/jdk",
658659
}),
659660
Effect.provideService(HostProcess.Platform, "darwin"),
660661
);

‎apps/server/src/device/LocalDeviceHost.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ const hubEnvironment = Effect.fn("LocalDeviceHost.hubEnvironment")(function* (
276276
.run({
277277
command: emulator,
278278
args: [`-help-camera-${facing}`],
279-
cwd: workingDirectory,
280279
env,
281280
timeout: Duration.seconds(5),
282281
})
@@ -879,6 +878,7 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () {
879878
)
880879
: command,
881880
args,
881+
cwd: workingDirectory,
882882
env,
883883
timeout: Duration.millis(options?.timeoutMs ?? 20_000),
884884
timeoutBehavior: "timedOutResult",

0 commit comments

Comments
 (0)