From 8ab242c5c5dcdd0a6f0154f9971b6196e93c20a6 Mon Sep 17 00:00:00 2001 From: Yang Chen Date: Sun, 24 Nov 2019 18:10:16 +1100 Subject: [PATCH 1/3] Update npm packages. --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27ea3bc9..f3f013df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2800,9 +2800,9 @@ "dev": true }, "handlebars": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz", - "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz", + "integrity": "sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -5868,9 +5868,9 @@ "dev": true }, "uglify-js": { - "version": "3.6.7", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.7.tgz", - "integrity": "sha512-4sXQDzmdnoXiO+xvmTzQsfIiwrjUCSA95rSP4SEd8tDb51W2TiDOlL76Hl+Kw0Ie42PSItCW8/t6pBNCF2R48A==", + "version": "3.6.9", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz", + "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==", "dev": true, "optional": true, "requires": { From 0fde7031bc2c53ecafb732f5e82d6469fc089b55 Mon Sep 17 00:00:00 2001 From: Yang Chen Date: Sat, 30 Nov 2019 22:02:47 +1100 Subject: [PATCH 2/3] Increase emulator boot timeout to 5 mins. --- .github/workflows/workflow.yml | 4 ++-- lib/emulator-manager.js | 2 +- src/emulator-manager.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 80d3805f..1792a51b 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -29,8 +29,8 @@ jobs: uses: ./ with: api-level: ${{ matrix.api-level }} - target: default - arch: x86 + target: google_apis + arch: x86_64 profile: Nexus 6 headless: true disable-animations: true diff --git a/lib/emulator-manager.js b/lib/emulator-manager.js index 5a762926..16e7e902 100644 --- a/lib/emulator-manager.js +++ b/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`; /** diff --git a/src/emulator-manager.ts b/src/emulator-manager.ts index 3d018646..7943b803 100644 --- a/src/emulator-manager.ts +++ b/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`; From 0d46bc07bd826a6d05344797313673072e2af225 Mon Sep 17 00:00:00 2001 From: Yang Chen Date: Sat, 30 Nov 2019 22:13:36 +1100 Subject: [PATCH 3/3] Prepare for release 1.0.2 --- CHANGELOG.md | 14 ++++++++++++++ RELEASING.md | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..2875d780 --- /dev/null +++ b/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. diff --git a/RELEASING.md b/RELEASING.md index 39de6f47..a7bcaeff 100644 --- a/RELEASING.md +++ b/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`).