From e93b947104faaa5787899e33afb46349a9ac99f0 Mon Sep 17 00:00:00 2001 From: Yang Date: Tue, 9 Jul 2024 12:51:00 +1000 Subject: [PATCH] Add missing compiled js files from #383. --- lib/emulator-manager.js | 2 +- lib/main.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/emulator-manager.js b/lib/emulator-manager.js index a86015d4f..a74991e14 100644 --- a/lib/emulator-manager.js +++ b/lib/emulator-manager.js @@ -72,7 +72,7 @@ function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, heapSiz } // start emulator console.log('Starting emulator.'); - yield exec.exec(`sh -c \\"${process.env.ANDROID_HOME}/emulator/emulator -avd "${avdName}" ${emulatorOptions} &"`, [], { + yield exec.exec(`sh -c \\"${process.env.ANDROID_HOME}/emulator/emulator -port ${port} -avd "${avdName}" ${emulatorOptions} &"`, [], { listeners: { stderr: (data) => { if (data.toString().includes('invalid command-line parameter')) { diff --git a/lib/main.js b/lib/main.js index 8b7761d3d..21a5d4918 100644 --- a/lib/main.js +++ b/lib/main.js @@ -42,6 +42,7 @@ const channel_id_mapper_1 = require("./channel-id-mapper"); const fs_1 = require("fs"); function run() { return __awaiter(this, void 0, void 0, function* () { + let port = input_validator_1.MIN_PORT; try { console.log(`::group::Configure emulator`); let linuxSupportKVM = false; @@ -103,7 +104,7 @@ function run() { const emulatorBootTimeout = parseInt(core.getInput('emulator-boot-timeout'), 10); console.log(`Emulator boot timeout: ${emulatorBootTimeout}`); // Emulator port to use - const port = parseInt(core.getInput('emulator-port'), 10); + port = parseInt(core.getInput('emulator-port'), 10); (0, input_validator_1.checkPort)(port); console.log(`emulator port: ${port}`); // emulator options @@ -220,7 +221,7 @@ function run() { } catch (error) { // kill the emulator so the action can exit - yield (0, emulator_manager_1.killEmulator)(input_validator_1.MIN_PORT); + yield (0, emulator_manager_1.killEmulator)(port); core.setFailed(error instanceof Error ? error.message : error); } });