Merge branch 'main' into release/v2

* main:
  Prepare for release 2.11.0.
  Support running multiple actions sequentially in a single job.
  Add RxBinding to adopter list.
  Rename master branch to main.

.github/workflows/workflow.yml

@@ -3,23 +3,36 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - main
     paths-ignore:
       - '**.md'
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+    env:
+      JAVA_TOOL_OPTIONS: -Xmx4g
     timeout-minutes: 15
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest]
         api-level: [16, 23, 29]
+        target: [default, google_apis]
         exclude:
           - os: ubuntu-latest
             api-level: 23
           - os: ubuntu-latest
             api-level: 29
+          - target: google_apis
+            api-level: 16
+          - target: google_apis
+            api-level: 23
+          - target: google_apis
+            api-level: 29
+        include:
+          - os: macos-latest
+            api-level: 30
+            target: google_apis
     steps:
     - name: checkout
       uses: actions/checkout@v2
@@ -38,9 +51,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 14
-    - name: Clean cache
-      if: matrix.os == 'macos-latest'
-      run: mv ~/.gradle/caches ~/.gradle/.invalid_caches
     - uses: actions/cache@v1
       with:
         path: ~/.gradle/caches
@@ -49,7 +59,7 @@ jobs:
       uses: ./
       with:
         api-level: ${{ matrix.api-level }}
-        target: default
+        target: ${{ matrix.target }}
         arch: x86
         profile: Nexus 6
         avd-name: test

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## v2.11.0
+
+* Support running multiple instances of the action sequentially in a single job - [#73](https://github.com/ReactiveCircus/android-emulator-runner/issues/73).
+
+## v2.10.0
+
+* Support Android 11 (API 30) system images.
+* Bump build tools to `30.0.0`.
+
+## v2.9.0
+
+* Updated to SDK command-line tools `2.0`.
+
 ## v2.8.0
 
 * Added support for specifying a custom name used for creating the **AVD** - [#59](https://github.com/ReactiveCircus/android-emulator-runner/issues/59).

README.md

@@ -4,7 +4,7 @@
   <a href="https://github.com/ReactiveCircus/android-emulator-runner"><img alt="GitHub Actions status" src="https://github.com/ReactiveCircus/android-emulator-runner/workflows/Main%20workflow/badge.svg"></a>
 </p>
 
-A GitHub Action for installing, configuring and running hardware-accelerated Android Emulators on macOS virtual machines (or Linux virtual machines but without hardware accleration).
+A GitHub Action for installing, configuring and running hardware-accelerated Android Emulators on macOS virtual machines.
 
 The old ARM-based emulators were slow and are no longer supported by Google. The modern Intel Atom (x86 and x86_64) emulators require hardware acceleration (HAXM on Mac & Windows, QEMU on Linux) from the host to run fast. This presents a challenge on CI as to be able to run hardware accelerated emulators within a docker container, **KVM** must be supported by the host VM which isn't the case for cloud-based CI providers due to infrastructural limits. If you want to learn more about this, here's an article I wrote: [Running Android Instrumented Tests on CI](https://dev.to/ychescale9/running-android-emulators-on-ci-from-bitrise-io-to-github-actions-3j76).
 
@@ -24,8 +24,6 @@ This action automates the process by doing the following:
 
 It is recommended to run this action on a **macOS** VM, e.g. `macos-latest` or `macos-10.15` to take advantage of hardware accleration support provided by **HAXM**.
 
-Please note that while Linux VMs (e.g. `ubuntu-latest` or `ubuntu-18.04`) are also supported, hardware acceleration will **not** be available.
-
 A workflow that uses **android-emulator-runner** to run your instrumented tests on **API 29**:
 
 ```
@@ -88,8 +86,6 @@ jobs:
 
 ## Configurations
 
-|  | **Required** | **Default** | **Description** |
-|----------------------|--------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 |  | **Required** | **Default** | **Description** |
 |----------------------|--------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `api-level` | Required | N/A | API level of the platform system image - e.g. 23 for Android Marshmallow, 29 for Android 10. **Minimum API level supported is 15**. |
@@ -107,7 +103,12 @@ jobs:
 
 Default `emulator-options`: `-no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim`.
 
-_Please note that if you are running on a Linux VM, `-no-accel` will be added to the `emulator-options` to make sure hardware acceleration is turned off._
+## Can I use this action on Linux VMs?
+
+The short answer is yes but it's expected to be a much worse experience (on some newer API levels it might not work at all) than running it on macOS.
+
+For a longer answer please refer to [this issue](https://github.com/ReactiveCircus/android-emulator-runner/issues/46).
+
 
 ## Who is using Android Emulator Runner?
 
@@ -115,16 +116,18 @@ These are some of the open-source projects using (or used) **Android Emulator Ru
 
 - [coil-kt/coil](https://github.com/coil-kt/coil/blob/master/.github/workflows/)
 - [cashapp/sqldelight](https://github.com/cashapp/sqldelight/blob/master/.github/workflows/)
-- [square/workflow](https://github.com/square/workflow/blob/master/.github/workflows/)
+- [square/workflow](https://github.com/square/workflow/blob/main/.github/workflows/)
 - [square/retrofit](https://github.com/square/retrofit/blob/master/.github/workflows/)
 - [natario1/CameraView](https://github.com/natario1/CameraView/tree/master/.github/workflows)
 - [natario1/Transcoder](https://github.com/natario1/Transcoder/tree/master/.github/workflows)
-- [chrisbanes/insetter](https://github.com/chrisbanes/insetter/tree/master/.github/workflows)
-- [slackhq/keeper](https://github.com/slackhq/keeper/tree/master/.github/workflows)
+- [chrisbanes/insetter](https://github.com/chrisbanes/insetter/tree/main/.github/workflows)
+- [slackhq/keeper](https://github.com/slackhq/keeper/tree/main/.github/workflows)
 - [android/compose-samples](https://github.com/android/compose-samples/blob/master/.github/workflows/ci.yaml)
-- [ReactiveCircus/streamlined](https://github.com/ReactiveCircus/streamlined/tree/master/.github/workflows)
+- [ReactiveCircus/streamlined](https://github.com/ReactiveCircus/streamlined/tree/main/.github/workflows)
 - [ReactiveCircus/FlowBinding](https://github.com/ReactiveCircus/FlowBinding)
+- [JakeWharton/RxBinding](https://github.com/JakeWharton/RxBinding/tree/master/.github/workflows)
 - [vinaygaba/Learn-Jetpack-Compose-By-Example](https://github.com/vinaygaba/Learn-Jetpack-Compose-By-Example/)
 - [ashishb/adb-enhanced](https://github.com/ashishb/adb-enhanced/tree/master/.github/workflows)
+- [vgaidarji/ci-matters](https://github.com/vgaidarji/ci-matters/blob/master/.github/workflows/main.yaml)
 
 If you are using **Android Emulator Runner** and want your project included in the list, please feel free to create an issue or open a pull request.

RELEASING.md

@@ -4,7 +4,7 @@ Refer to the [recommendeations for versioning and releasing actions](https://git
 
 ## New major release
 
-- From `master` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date.
+- From `main` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date.
 - Update `CHANGELOG.md`, push change with "Prepare for release X.Y.Z." (where X.Y.Z is the new version).
 - Create a new branch e.g. `release/v1`, comment out `node_modules/` in `.gitignore`, commit the change (do not commit yet `node_modules`).
 - Run `npm prune --production`.
@@ -17,9 +17,9 @@ Refer to the [recommendeations for versioning and releasing actions](https://git
 
 ## New minor / patch release
 
-- From `master` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date.
+- From `main` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date.
 - Update `CHANGELOG.md`, push change with "Prepare for release X.Y.Z." (where X.Y.Z is the new version).
-- Merge from `master` into the release branch e.g. `release/v1`.
+- Merge from `main` into the release branch e.g. `release/v1`.
 - Run `npm prune --production`.
 - Commit merged changes (and the pruned `node_modules`).
 - Push to remote.

lib/sdk-installer.js

@@ -17,9 +17,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core = __importStar(require("@actions/core"));
 const exec = __importStar(require("@actions/exec"));
-const BUILD_TOOLS_VERSION = '29.0.3';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
+const io = __importStar(require("@actions/io"));
+const fs = __importStar(require("fs"));
+const BUILD_TOOLS_VERSION = '30.0.0';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip';
+const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6514223_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.
@@ -27,27 +29,38 @@ const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/comman
 function installAndroidSdk(apiLevel, target, arch, emulatorBuild, ndkVersion, cmakeVersion) {
     return __awaiter(this, void 0, void 0, function* () {
         const isOnMac = process.platform === 'darwin';
-        console.log('Installing new cmdline-tools.');
-        const sdkUrl = isOnMac ? CMDLINE_TOOLS_URL_MAC : CMDLINE_TOOLS_URL_LINUX;
-        yield exec.exec(`sudo mkdir ${process.env.ANDROID_HOME}/cmdline-tools`);
-        yield exec.exec(`curl -fo commandlinetools.zip ${sdkUrl}`);
-        yield exec.exec(`sudo unzip -q commandlinetools.zip -d ${process.env.ANDROID_HOME}/cmdline-tools`);
-        yield exec.exec(`sudo rm -f commandlinetools.zip`);
-        // add paths for commandline-tools and platform-tools
-        core.addPath(`${process.env.ANDROID_HOME}/cmdline-tools/tools:${process.env.ANDROID_HOME}/cmdline-tools/tools/bin:${process.env.ANDROID_HOME}/platform-tools`);
-        // additional permission and license requirements for Linux
         if (!isOnMac) {
-            yield exec.exec(`sh -c \\"sudo chmod -R 777 ${process.env.ANDROID_HOME}"`);
-            yield exec.exec(`sh -c \\"echo -e '\n84831b9409646a918e30573bab4c9c91346d8abd' > ${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license"`);
+            yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`);
+        }
+        const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`;
+        if (!fs.existsSync(cmdlineToolsPath)) {
+            console.log('Installing new cmdline-tools.');
+            const sdkUrl = isOnMac ? CMDLINE_TOOLS_URL_MAC : CMDLINE_TOOLS_URL_LINUX;
+            yield io.mkdirP(`${process.env.ANDROID_HOME}/cmdline-tools`);
+            yield exec.exec(`curl -fo commandlinetools.zip ${sdkUrl}`);
+            yield exec.exec(`unzip -q commandlinetools.zip -d ${cmdlineToolsPath}`);
+            yield io.rmRF('commandlinetools.zip');
+            // add paths for commandline-tools and platform-tools
+            core.addPath(`${cmdlineToolsPath}/tools:${cmdlineToolsPath}/tools/bin:${process.env.ANDROID_HOME}/platform-tools`);
+        }
+        // additional permission and license requirements for Linux
+        const sdkPreviewLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license`;
+        if (!isOnMac && !fs.existsSync(sdkPreviewLicensePath)) {
+            yield exec.exec(`sh -c \\"echo -e '\n84831b9409646a918e30573bab4c9c91346d8abd' > ${sdkPreviewLicensePath}"`);
+        }
+        // license required for API 30 system images
+        const sdkArmDbtLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-arm-dbt-license`;
+        if (apiLevel == 30 && !fs.existsSync(sdkArmDbtLicensePath)) {
+            yield exec.exec(`sh -c \\"echo -e '\n859f317696f67ef3d7f30a50a5560e7834b43903' > ${sdkArmDbtLicensePath}"`);
         }
         console.log('Installing latest build tools, platform tools, and platform.');
         yield exec.exec(`sh -c \\"sdkmanager --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' > /dev/null"`);
         if (emulatorBuild) {
             console.log(`Installing emulator build ${emulatorBuild}.`);
             yield exec.exec(`curl -fo emulator.zip https://dl.google.com/android/repository/emulator-${isOnMac ? 'darwin' : 'linux'}-${emulatorBuild}.zip`);
-            yield exec.exec(`sudo rm -rf ${process.env.ANDROID_HOME}/emulator`);
-            yield exec.exec(`sudo unzip -q emulator.zip -d ${process.env.ANDROID_HOME}`);
-            yield exec.exec(`sudo rm -f emulator.zip`);
+            yield io.rmRF(`${process.env.ANDROID_HOME}/emulator`);
+            yield exec.exec(`unzip -q emulator.zip -d ${process.env.ANDROID_HOME}`);
+            yield io.rmRF('emulator.zip');
         }
         else {
             console.log('Installing latest emulator.');

src/sdk-installer.ts

@@ -1,9 +1,11 @@
 import * as core from '@actions/core';
 import * as exec from '@actions/exec';
+import * as io from '@actions/io';
+import * as fs from 'fs';
 
-const BUILD_TOOLS_VERSION = '29.0.3';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
+const BUILD_TOOLS_VERSION = '30.0.0';
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip';
+const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6514223_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,
@@ -11,20 +13,34 @@ const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/comman
  */
 export async function installAndroidSdk(apiLevel: number, target: string, arch: string, emulatorBuild?: string, ndkVersion?: string, cmakeVersion?: string): Promise<void> {
   const isOnMac = process.platform === 'darwin';
-  console.log('Installing new cmdline-tools.');
-  const sdkUrl = isOnMac ? CMDLINE_TOOLS_URL_MAC : CMDLINE_TOOLS_URL_LINUX;
-  await exec.exec(`sudo mkdir ${process.env.ANDROID_HOME}/cmdline-tools`);
-  await exec.exec(`curl -fo commandlinetools.zip ${sdkUrl}`);
-  await exec.exec(`sudo unzip -q commandlinetools.zip -d ${process.env.ANDROID_HOME}/cmdline-tools`);
-  await exec.exec(`sudo rm -f commandlinetools.zip`);
 
-  // add paths for commandline-tools and platform-tools
-  core.addPath(`${process.env.ANDROID_HOME}/cmdline-tools/tools:${process.env.ANDROID_HOME}/cmdline-tools/tools/bin:${process.env.ANDROID_HOME}/platform-tools`);
+  if (!isOnMac) {
+    await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME} -R`);
+  }
+
+  const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`;
+  if (!fs.existsSync(cmdlineToolsPath)) {
+    console.log('Installing new cmdline-tools.');
+    const sdkUrl = isOnMac ? CMDLINE_TOOLS_URL_MAC : CMDLINE_TOOLS_URL_LINUX;
+    await io.mkdirP(`${process.env.ANDROID_HOME}/cmdline-tools`);
+    await exec.exec(`curl -fo commandlinetools.zip ${sdkUrl}`);
+    await exec.exec(`unzip -q commandlinetools.zip -d ${cmdlineToolsPath}`);
+    await io.rmRF('commandlinetools.zip');
+
+    // add paths for commandline-tools and platform-tools
+    core.addPath(`${cmdlineToolsPath}/tools:${cmdlineToolsPath}/tools/bin:${process.env.ANDROID_HOME}/platform-tools`);
+  }
 
   // additional permission and license requirements for Linux
-  if (!isOnMac) {
-    await exec.exec(`sh -c \\"sudo chmod -R 777 ${process.env.ANDROID_HOME}"`);
-    await exec.exec(`sh -c \\"echo -e '\n84831b9409646a918e30573bab4c9c91346d8abd' > ${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license"`);
+  const sdkPreviewLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-preview-license`;
+  if (!isOnMac && !fs.existsSync(sdkPreviewLicensePath)) {
+    await exec.exec(`sh -c \\"echo -e '\n84831b9409646a918e30573bab4c9c91346d8abd' > ${sdkPreviewLicensePath}"`);
+  }
+
+  // license required for API 30 system images
+  const sdkArmDbtLicensePath = `${process.env.ANDROID_HOME}/licenses/android-sdk-arm-dbt-license`;
+  if (apiLevel == 30 && !fs.existsSync(sdkArmDbtLicensePath)) {
+    await exec.exec(`sh -c \\"echo -e '\n859f317696f67ef3d7f30a50a5560e7834b43903' > ${sdkArmDbtLicensePath}"`);
   }
 
   console.log('Installing latest build tools, platform tools, and platform.');
@@ -33,9 +49,9 @@ export async function installAndroidSdk(apiLevel: number, target: string, arch:
   if (emulatorBuild) {
     console.log(`Installing emulator build ${emulatorBuild}.`);
     await exec.exec(`curl -fo emulator.zip https://dl.google.com/android/repository/emulator-${isOnMac ? 'darwin' : 'linux'}-${emulatorBuild}.zip`);
-    await exec.exec(`sudo rm -rf ${process.env.ANDROID_HOME}/emulator`);
-    await exec.exec(`sudo unzip -q emulator.zip -d ${process.env.ANDROID_HOME}`);
-    await exec.exec(`sudo rm -f emulator.zip`);
+    await io.rmRF(`${process.env.ANDROID_HOME}/emulator`);
+    await exec.exec(`unzip -q emulator.zip -d ${process.env.ANDROID_HOME}`);
+    await io.rmRF('emulator.zip');
   } else {
     console.log('Installing latest emulator.');
     await exec.exec(`sh -c \\"sdkmanager --install emulator > /dev/null"`);

test-fixture/app/build.gradle

@@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.0"
 
     defaultConfig {
         applicationId "com.example.testapp"
         minSdkVersion 15
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -28,7 +28,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.13'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'

test-fixture/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.6.2'
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

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-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip