Merge branch 'main' into release/v2

ychescale9 · ychescale9 · commit b390b0e11666 · 2022-07-12T18:48:20.000+10:00
* main: Prepare for release 2.25.0. Check in missing compiled js file. Auto detect hardware acceleration on Linux (ReactiveCircus#254) Build tools 33.0.0. Update test fixture dependencies. Update Kotlin and AGP in test-fixture. SDK command-line tools 7.0.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## v2.25.0
+
+* Auto detect hardware acceleration on Linux. - [#254](https://github.com/ReactiveCircus/android-emulator-runner/pull/254) @notbigdata.
+* Update build tools to `33.0.0`.
+* Update SDK command-line tools to `7.0`.
+
 ## v2.24.0
 
 * Add option to specify `heap-size` for the AVD. - [#245](https://github.com/ReactiveCircus/android-emulator-runner/pull/245) @timusus.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -34,9 +34,9 @@ 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 CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-8092744_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip';
+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';
 /**
  * Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
  * and the system image for the chosen API level, CPU arch, and target.
diff --git 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
@@ -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/src/sdk-installer.ts b/src/sdk-installer.ts
@@ -4,9 +4,9 @@ import * as io from '@actions/io';
 import * as tc from '@actions/tool-cache';
 import * as fs from 'fs';
 
-const BUILD_TOOLS_VERSION = '32.0.0';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-8092744_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-8092744_latest.zip';
+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';
 
 /**
  * Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
diff --git a/test-fixture/app/build.gradle b/test-fixture/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "32.0.0"
+    compileSdkVersion 33
+    buildToolsVersion "33.0.0"
 
     defaultConfig {
         applicationId "com.example.testapp"
         minSdkVersion 15
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 1
         versionName "1.0"
 
diff --git a/test-fixture/build.gradle b/test-fixture/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.10'
+    ext.kotlin_version = '1.7.0'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -18,7 +18,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/test-fixture/gradle/wrapper/gradle-wrapper.properties b/test-fixture/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ function checkDisableSpellchecker(disableSpellchecker) {`
`51`	`51`	`}`
`52`	`52`	`exports.checkDisableSpellchecker = checkDisableSpellchecker;`
`53`	`53`	`function checkDisableLinuxHardwareAcceleration(disableLinuxHardwareAcceleration) {`
`54`		`- if (!isValidBoolean(disableLinuxHardwareAcceleration)) {`
`55`		- throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false'.`);
	`54`	`+ if (!(isValidBoolean(disableLinuxHardwareAcceleration) \|\| disableLinuxHardwareAcceleration === 'auto')) {`
	`55`	+ throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false' or 'auto'.`);
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`exports.checkDisableLinuxHardwareAcceleration = checkDisableLinuxHardwareAcceleration;`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ export function checkDisableSpellchecker(disableSpellchecker: string): void {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`export function checkDisableLinuxHardwareAcceleration(disableLinuxHardwareAcceleration: string): void {`
`52`		`- if (!isValidBoolean(disableLinuxHardwareAcceleration)) {`
`53`		- throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false'.`);
	`52`	`+ if (!(isValidBoolean(disableLinuxHardwareAcceleration) \|\| disableLinuxHardwareAcceleration === 'auto')) {`
	`53`	+ throw new Error(`Input for input.disable-linux-hw-accel should be either 'true' or 'false' or 'auto'.`);
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`