Merge branch 'master' into release/v1

* master:
  Prepare for release 1.0.2
  Increase emulator boot timeout to 5 mins.
  Update npm packages.

.github/workflows/workflow.yml

@@ -29,8 +29,8 @@ jobs:
       uses: ./
       with:
         api-level: ${{ matrix.api-level }}
-        target: default
+        target: google_apis
-        arch: x86
+        arch: x86_64
         profile: Nexus 6
         headless: true
         disable-animations: true

CHANGELOG.md

@@ -0,0 +1,14 @@
+# Change Log
+
+## v1.0.2
+
+* Increased emulator boot timeout to **5 mins**.
+
+## v1.0.1
+
+* Fixed docs.
+* Minor internal changes.
+
+## v1.0.0
+
+Initial release.

README.md

@@ -8,22 +8,23 @@ A GitHub Action for installing, configuring and running Android Emulators on mac
 
 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.
 
-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 instrumented tests directly on the VM.
+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 
+tests directly on the VM.
 
-This Action automates the process by doing the following:
+This action automates the process by doing the following:
 
 - Install / update the required **Android SDK** components including `build-tools`, `platform-tools`, `platform` (for the required API level), `emulator` and `system-images` (for the required API level).
-- Create a new instance of **AVD** with the required [configurations](#configurations).
+- Create a new instance of **AVD** with the provided [configurations](#configurations).
-- Launch a new Emulator with the required [configurations](#configurations).
+- Launch a new Emulator with the provided [configurations](#configurations).
 - Wait until the Emulator is booted and ready for use.
-- Run a custom script provided by the user of the action - e.g. `./gradlew connectedCheck`.
+- Run a custom script provided by user once the Emulator is up and running - e.g. `./gradlew connectedCheck`.
-- Kill the Emulator and the finish the action.
+- Kill the Emulator and finish the action.
 
 ## Usage
 
 Note that this action must be run on a **macOS** VM, e.g. `macOS-latest` or `macOS-10.14`.
 
-A workflow that uses **android-emulator-runner** to run your instrumented on **API 29**:
+A workflow that uses **android-emulator-runner** to run your instrumented tests on **API 29**:
 
 ```
 jobs:

RELEASING.md

@@ -5,6 +5,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.
+- 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`.
 - Now commit the changes (the pruned `node_modules`).
@@ -17,6 +18,7 @@ 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.
+- 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`.
 - Run `npm prune --production`.
 - Commit merged changes (and the pruned `node_modules`).

lib/emulator-manager.js

@@ -16,7 +16,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const exec = __importStar(require("@actions/exec"));
-const EMULATOR_BOOT_TIMEOUT_SECONDS = 120;
+const EMULATOR_BOOT_TIMEOUT_SECONDS = 300;
 const AVD_MANAGER_PATH = `${process.env.ANDROID_HOME}/tools/bin/avdmanager`;
 const ADB_PATH = `${process.env.ANDROID_HOME}/platform-tools/adb`;
 /**
@@ -31,12 +31,12 @@ function launchEmulator(apiLevel, target, arch, profile, headless, disableAnimat
         }
         else {
             console.log(`Creating AVD without custom profile.`);
-            yield exec.exec(`bash -c \\"echo no | ${AVD_MANAGER_PATH} create avd --force -n test --abi '${target}/${arch}' --package 'system-images;android-${apiLevel};${target};${arch}'"`);
+            yield exec.exec(`sh -c \\"echo no | ${AVD_MANAGER_PATH} create avd --force -n test --abi '${target}/${arch}' --package 'system-images;android-${apiLevel};${target};${arch}'"`);
         }
         // start emulator
         console.log('Starting emulator.');
         const noWindow = headless ? '-no-window' : '';
-        yield exec.exec(`bash -c \\"${process.env.ANDROID_HOME}/emulator/emulator -avd test ${noWindow} -no-snapshot -noaudio -no-boot-anim &"`);
+        yield exec.exec(`sh -c \\"${process.env.ANDROID_HOME}/emulator/emulator -avd test ${noWindow} -no-snapshot -noaudio -no-boot-anim &"`);
         // wait for emulator to complete booting
         yield waitForDevice();
         yield exec.exec(`${ADB_PATH} shell input keyevent 82`);

lib/sdk-installer.js

@@ -25,9 +25,9 @@ function installAndroidSdk(apiLevel, target, arch) {
     return __awaiter(this, void 0, void 0, function* () {
         const sdkmangerPath = `${process.env.ANDROID_HOME}/tools/bin/sdkmanager`;
         console.log('Installing latest build tools, platform tools, platform, and emulator.');
-        yield exec.exec(`bash -c \\"${sdkmangerPath} --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' emulator > /dev/null"`);
+        yield exec.exec(`sh -c \\"${sdkmangerPath} --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' emulator > /dev/null"`);
         console.log('Installing system images.');
-        yield exec.exec(`bash -c \\"${sdkmangerPath} --install 'system-images;android-${apiLevel};${target};${arch}' > /dev/null"`);
+        yield exec.exec(`sh -c \\"${sdkmangerPath} --install 'system-images;android-${apiLevel};${target};${arch}' > /dev/null"`);
     });
 }
 exports.installAndroidSdk = installAndroidSdk;

package-lock.json

@@ -2800,9 +2800,9 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.5.1",
+      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz",
-      "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
+      "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.0",
@@ -5868,9 +5868,9 @@
       "dev": true
     },
     "uglify-js": {
-      "version": "3.6.7",
+      "version": "3.6.9",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.7.tgz",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz",
-      "integrity": "sha512-4sXQDzmdnoXiO+xvmTzQsfIiwrjUCSA95rSP4SEd8tDb51W2TiDOlL76Hl+Kw0Ie42PSItCW8/t6pBNCF2R48A==",
+      "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==",
       "dev": true,
       "optional": true,
       "requires": {

src/emulator-manager.ts

@@ -1,6 +1,6 @@
 import * as exec from '@actions/exec';
 
-const EMULATOR_BOOT_TIMEOUT_SECONDS = 120;
+const EMULATOR_BOOT_TIMEOUT_SECONDS = 300;
 const AVD_MANAGER_PATH = `${process.env.ANDROID_HOME}/tools/bin/avdmanager`;
 const ADB_PATH = `${process.env.ANDROID_HOME}/platform-tools/adb`;
 
@@ -14,13 +14,13 @@ export async function launchEmulator(apiLevel: number, target: string, arch: str
     await exec.exec(`${AVD_MANAGER_PATH} create avd --force -n test --abi "${target}/${arch}" --package "system-images;android-${apiLevel};${target};${arch}" --device "${profile}"`);
   } else {
     console.log(`Creating AVD without custom profile.`);
-    await exec.exec(`bash -c \\"echo no | ${AVD_MANAGER_PATH} create avd --force -n test --abi '${target}/${arch}' --package 'system-images;android-${apiLevel};${target};${arch}'"`);
+    await exec.exec(`sh -c \\"echo no | ${AVD_MANAGER_PATH} create avd --force -n test --abi '${target}/${arch}' --package 'system-images;android-${apiLevel};${target};${arch}'"`);
   }
 
   // start emulator
   console.log('Starting emulator.');
   const noWindow = headless ? '-no-window' : '';
-  await exec.exec(`bash -c \\"${process.env.ANDROID_HOME}/emulator/emulator -avd test ${noWindow} -no-snapshot -noaudio -no-boot-anim &"`);
+  await exec.exec(`sh -c \\"${process.env.ANDROID_HOME}/emulator/emulator -avd test ${noWindow} -no-snapshot -noaudio -no-boot-anim &"`);
 
   // wait for emulator to complete booting
   await waitForDevice();

src/sdk-installer.ts

@@ -9,7 +9,7 @@ const BUILD_TOOLS_VERSION = '29.0.2';
 export async function installAndroidSdk(apiLevel: number, target: string, arch: string): Promise<void> {
   const sdkmangerPath = `${process.env.ANDROID_HOME}/tools/bin/sdkmanager`;
   console.log('Installing latest build tools, platform tools, platform, and emulator.');
-  await exec.exec(`bash -c \\"${sdkmangerPath} --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' emulator > /dev/null"`);
+  await exec.exec(`sh -c \\"${sdkmangerPath} --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' emulator > /dev/null"`);
   console.log('Installing system images.');
-  await exec.exec(`bash -c \\"${sdkmangerPath} --install 'system-images;android-${apiLevel};${target};${arch}' > /dev/null"`);
+  await exec.exec(`sh -c \\"${sdkmangerPath} --install 'system-images;android-${apiLevel};${target};${arch}' > /dev/null"`);
 }