From 1a80632168deb5f99ef1d91552b5027ed1c500e5 Mon Sep 17 00:00:00 2001 From: notbigdata <59257487+notbigdata@users.noreply.github.com> Date: Sun, 10 Jul 2022 17:18:09 +0200 Subject: [PATCH] Auto detect hardware acceleration on Linux --- __tests__/input-validator.test.ts | 9 +++++++-- action.yml | 4 ++-- lib/input-validator.js | 4 ++-- lib/main.js | 15 +++++++++++++-- lib/sdk-installer.js | 2 +- src/input-validator.ts | 4 ++-- src/main.ts | 18 ++++++++++++++---- test-fixture/gradlew | 0 8 files changed, 41 insertions(+), 15 deletions(-) mode change 100755 => 100644 test-fixture/gradlew diff --git a/__tests__/input-validator.test.ts b/__tests__/input-validator.test.ts index 5c52a2c53..ba7e20eb4 100644 --- a/__tests__/input-validator.test.ts +++ b/__tests__/input-validator.test.ts @@ -211,10 +211,10 @@ describe('disable-linux-hw-accel validator tests', () => { const func = () => { validator.checkDisableLinuxHardwareAcceleration('yes'); }; - expect(func).toThrowError(`Input for input.disable-linux-hw-accel should be either 'true' or 'false'.`); + expect(func).toThrowError(`Input for input.disable-linux-hw-accel should be either 'true' or 'false' or 'auto'.`); }); - it('Validates successfully if disable-linux-hw-accel is either true or false', () => { + it('Validates successfully if disable-linux-hw-accel is either true or false or auto', () => { const func1 = () => { validator.checkDisableLinuxHardwareAcceleration('true'); }; @@ -224,6 +224,11 @@ describe('disable-linux-hw-accel validator tests', () => { validator.checkDisableLinuxHardwareAcceleration('false'); }; expect(func2).not.toThrow(); + + const func3 = () => { + validator.checkDisableLinuxHardwareAcceleration('auto'); + }; + expect(func3).not.toThrow(); }); }); diff --git a/action.yml b/action.yml index 12ae7a15d..9c5b36d2f 100644 --- a/action.yml +++ b/action.yml @@ -43,8 +43,8 @@ inputs: description: 'whether to disable spellchecker - `true` or `false`' default: 'false' disable-linux-hw-accel: - description: 'whether to disable hardware acceleration on Linux machines - `true` or `false`' - default: 'true' + description: 'whether to disable hardware acceleration on Linux machines - `true` or `false` or `auto`' + default: 'auto' enable-hw-keyboard: description: 'whether to enable hardware keyboard - `true` or `false`.' default: 'false' diff --git a/lib/input-validator.js b/lib/input-validator.js index a7bbabe44..95959a5ad 100644 --- a/lib/input-validator.js +++ b/lib/input-validator.js @@ -51,8 +51,8 @@ function checkDisableSpellchecker(disableSpellchecker) { } exports.checkDisableSpellchecker = checkDisableSpellchecker; function checkDisableLinuxHardwareAcceleration(disableLinuxHardwareAcceleration) { - if (!isValidBoolean(disableLinuxHardwareAcceleration)) { - throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false'.`); + if (!(isValidBoolean(disableLinuxHardwareAcceleration) || disableLinuxHardwareAcceleration === 'auto')) { + throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false' or 'auto'.`); } } exports.checkDisableLinuxHardwareAcceleration = checkDisableLinuxHardwareAcceleration; diff --git a/lib/main.js b/lib/main.js index 1ac0a0daa..1ccc06d02 100644 --- a/lib/main.js +++ b/lib/main.js @@ -35,14 +35,22 @@ const emulator_manager_1 = require("./emulator-manager"); const exec = __importStar(require("@actions/exec")); const script_parser_1 = require("./script-parser"); const channel_id_mapper_1 = require("./channel-id-mapper"); +const fs_1 = require("fs"); function run() { return __awaiter(this, void 0, void 0, function* () { try { console.log(`::group::Configure emulator`); + let linuxSupportKVM = false; // only support running on macOS or Linux if (process.platform !== 'darwin') { if (process.platform === 'linux') { - console.warn(`You're running a Linux VM where hardware acceleration is not available. Please consider using a macOS VM instead to take advantage of native hardware acceleration support provided by HAXM.`); + try { + fs_1.accessSync('/dev/kvm', fs_1.constants.R_OK | fs_1.constants.W_OK); + linuxSupportKVM = true; + } + catch (_a) { + console.warn(`You're running a Linux VM where hardware acceleration is not available. Please consider using a macOS VM instead to take advantage of native hardware acceleration support provided by HAXM.`); + } } else { throw new Error('Unsupported virtual machine: please use either macos or ubuntu VM.'); @@ -102,8 +110,11 @@ function run() { const disableSpellchecker = disableSpellcheckerInput === 'true'; console.log(`disable spellchecker: ${disableSpellchecker}`); // disable linux hardware acceleration - const disableLinuxHardwareAccelerationInput = core.getInput('disable-linux-hw-accel'); + let disableLinuxHardwareAccelerationInput = core.getInput('disable-linux-hw-accel'); input_validator_1.checkDisableLinuxHardwareAcceleration(disableLinuxHardwareAccelerationInput); + if (disableLinuxHardwareAccelerationInput === 'auto' && process.platform === 'linux') { + disableLinuxHardwareAccelerationInput = linuxSupportKVM ? 'false' : 'true'; + } const disableLinuxHardwareAcceleration = disableLinuxHardwareAccelerationInput === 'true'; console.log(`disable Linux hardware acceleration: ${disableLinuxHardwareAcceleration}`); // enable hardware keyboard diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index 6fca04e3e..219f9c01c 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -34,7 +34,7 @@ const exec = __importStar(require("@actions/exec")); const io = __importStar(require("@actions/io")); const tc = __importStar(require("@actions/tool-cache")); const fs = __importStar(require("fs")); -const BUILD_TOOLS_VERSION = '32.0.0'; +const BUILD_TOOLS_VERSION = '33.0.0'; const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip'; const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip'; /** diff --git a/src/input-validator.ts b/src/input-validator.ts index cdafa7f19..7cf1e1b04 100644 --- a/src/input-validator.ts +++ b/src/input-validator.ts @@ -49,8 +49,8 @@ export function checkDisableSpellchecker(disableSpellchecker: string): void { } export function checkDisableLinuxHardwareAcceleration(disableLinuxHardwareAcceleration: string): void { - if (!isValidBoolean(disableLinuxHardwareAcceleration)) { - throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false'.`); + if (!(isValidBoolean(disableLinuxHardwareAcceleration) || disableLinuxHardwareAcceleration === 'auto')) { + throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false' or 'auto'.`); } } diff --git a/src/main.ts b/src/main.ts index 13fd80281..63d34c6b8 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,16 +17,23 @@ import { launchEmulator, killEmulator } from './emulator-manager'; import * as exec from '@actions/exec'; import { parseScript } from './script-parser'; import { getChannelId } from './channel-id-mapper'; +import { accessSync, constants } from 'fs'; async function run() { try { console.log(`::group::Configure emulator`); + let linuxSupportKVM = false; // only support running on macOS or Linux if (process.platform !== 'darwin') { if (process.platform === 'linux') { - console.warn( - `You're running a Linux VM where hardware acceleration is not available. Please consider using a macOS VM instead to take advantage of native hardware acceleration support provided by HAXM.` - ); + try { + accessSync('/dev/kvm', constants.R_OK | constants.W_OK); + linuxSupportKVM = true; + } catch { + console.warn( + `You're running a Linux VM where hardware acceleration is not available. Please consider using a macOS VM instead to take advantage of native hardware acceleration support provided by HAXM.` + ); + } } else { throw new Error('Unsupported virtual machine: please use either macos or ubuntu VM.'); } @@ -100,8 +107,11 @@ async function run() { console.log(`disable spellchecker: ${disableSpellchecker}`); // disable linux hardware acceleration - const disableLinuxHardwareAccelerationInput = core.getInput('disable-linux-hw-accel'); + let disableLinuxHardwareAccelerationInput = core.getInput('disable-linux-hw-accel'); checkDisableLinuxHardwareAcceleration(disableLinuxHardwareAccelerationInput); + if (disableLinuxHardwareAccelerationInput === 'auto' && process.platform === 'linux') { + disableLinuxHardwareAccelerationInput = linuxSupportKVM ? 'false' : 'true'; + } const disableLinuxHardwareAcceleration = disableLinuxHardwareAccelerationInput === 'true'; console.log(`disable Linux hardware acceleration: ${disableLinuxHardwareAcceleration}`); diff --git a/test-fixture/gradlew b/test-fixture/gradlew old mode 100755 new mode 100644