Merge branch 'main' into release/v2

* main:
  Prepare for release 2.12.0.
  Add support for using google_apis_playstore system images.
  Fix README.md typo

.github/workflows/workflow.yml

@@ -33,6 +33,10 @@ jobs:
           - os: macos-latest
             api-level: 30
             target: google_apis
+          - os: macos-latest
+            api-level: 24
+            target: playstore
+
     steps:
     - name: checkout
       uses: actions/checkout@v2

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## v2.12.0
+
+Added support for using the `playstore` system images:
+
+```
+- name: run tests
+  uses: reactivecircus/android-emulator-runner@v2
+  with:
+    api-level: 30
+    target: playstore
+    arch: x86
+    script: ./gradlew connectedCheck
+```
+
 ## v2.11.1
 
 * Update SDK command-line tools to `2.1`.

README.md

@@ -8,7 +8,7 @@ A GitHub Action for installing, configuring and running hardware-accelerated And
 
 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).
 
-The **masOS** VM provided by **GitHub Actions** has **HAXM** installed so we are able to create a new AVD instance, launch an emulator with hardware acceleration, and run our Android 
+The **macOS** VM provided by **GitHub Actions** has **HAXM** installed so we are able to create a new AVD instance, launch an emulator with hardware acceleration, and run our Android 
 tests directly on the VM.
 
 This action automates the process by doing the following:
@@ -86,10 +86,10 @@ jobs:
 
 ## Configurations
 
-|  | **Required** | **Default** | **Description** |
-|----------------------|--------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **Input** | **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**. |
-| `target` | Optional | `default` | Target of the system image - `default` or `google_apis`. |
+| `target` | Optional | `default` | Target of the system image - `default`, `google_apis` or `playstore`. |
 | `arch` | Optional | `x86` | CPU architecture of the system image - `x86` or `x86_64`. Note that `x86_64` image is only available for API 21+. |
 | `profile` | Optional | N/A | Hardware profile used for creating the AVD - e.g. `Nexus 6`. For a list of all profiles available, run `avdmanager list` and refer to the results under "Available Android Virtual Devices". |
 | `avd-name` | Optional | `test` | Custom AVD name used for creating the Android Virtual Device. |

__tests__/input-validator.test.ts

@@ -53,6 +53,11 @@ describe('target validator tests', () => {
       validator.checkTarget('google_apis');
     };
     expect(func2).not.toThrow();
+
+    const func3 = () => {
+      validator.checkTarget('google_apis');
+    };
+    expect(func3).not.toThrow();
   });
 });
 

action.yml

@@ -9,7 +9,7 @@ inputs:
     description: 'API level of the platform and system image - e.g. 23 for Android Marshmallow, 29 for Android 10'
     required: true
   target:
-    description: 'target of the system image - default or google_apis'
+    description: 'target of the system image - default, google_apis or playstore'
     default: 'default'
   arch:
     description: 'CPU architecture of the system image - x86 or x86_64'

lib/input-validator.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkEmulatorBuild = exports.checkDisableAnimations = exports.checkArch = exports.checkTarget = exports.checkApiLevel = exports.VALID_ARCHS = exports.VALID_TARGETS = exports.MIN_API_LEVEL = void 0;
 exports.MIN_API_LEVEL = 15;
-exports.VALID_TARGETS = ['default', 'google_apis'];
+exports.VALID_TARGETS = ['default', 'google_apis', 'google_apis_playstore'];
 exports.VALID_ARCHS = ['x86', 'x86_64'];
 function checkApiLevel(apiLevel) {
     if (isNaN(Number(apiLevel)) || !Number.isInteger(Number(apiLevel))) {

lib/main.js

@@ -52,7 +52,8 @@ function run() {
             const apiLevel = Number(apiLevelInput);
             console.log(`API level: ${apiLevel}`);
             // target of the system image
-            const target = core.getInput('target');
+            const targetInput = core.getInput('target');
+            const target = targetInput == 'playstore' ? 'google_apis_playstore' : targetInput;
             input_validator_1.checkTarget(target);
             console.log(`target: ${target}`);
             // CPU architecture of the system image