Skip to content

Commit 2174e7a

Browse files
committed
Merge branch 'master' into release/v1
* master: Prepare for release 1.0.2 Increase emulator boot timeout to 5 mins. Update npm packages.
2 parents 6097e0a + 0d46bc0 commit 2174e7a

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

.github/workflows/workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
uses: ./
3030
with:
3131
api-level: ${{ matrix.api-level }}
32-
target: default
33-
arch: x86
32+
target: google_apis
33+
arch: x86_64
3434
profile: Nexus 6
3535
headless: true
3636
disable-animations: true

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Change Log
2+
3+
## v1.0.2
4+
5+
* Increased emulator boot timeout to **5 mins**.
6+
7+
## v1.0.1
8+
9+
* Fixed docs.
10+
* Minor internal changes.
11+
12+
## v1.0.0
13+
14+
Initial release.

RELEASING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Refer to the [recommendeations for versioning and releasing actions](https://git
55
## New major release
66

77
- From `master` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date.
8+
- Update `CHANGELOG.md`, push change with "Prepare for release X.Y.Z." (where X.Y.Z is the new version).
89
- Create a new branch e.g. `release/v1`, comment out `node_modules/` in `.gitignore`, commit the change (do not commit yet `node_modules`).
910
- Run `npm prune --production`.
1011
- Now commit the changes (the pruned `node_modules`).
@@ -17,6 +18,7 @@ Refer to the [recommendeations for versioning and releasing actions](https://git
1718
## New minor / patch release
1819

1920
- From `master` branch, run `npm run build && npm test --clean && npm run lint` to make sure `lib/*.js` are up-to-date.
21+
- Update `CHANGELOG.md`, push change with "Prepare for release X.Y.Z." (where X.Y.Z is the new version).
2022
- Merge from `master` into the release branch e.g. `release/v1`.
2123
- Run `npm prune --production`.
2224
- Commit merged changes (and the pruned `node_modules`).

lib/emulator-manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
1616
};
1717
Object.defineProperty(exports, "__esModule", { value: true });
1818
const exec = __importStar(require("@actions/exec"));
19-
const EMULATOR_BOOT_TIMEOUT_SECONDS = 120;
19+
const EMULATOR_BOOT_TIMEOUT_SECONDS = 300;
2020
const AVD_MANAGER_PATH = `${process.env.ANDROID_HOME}/tools/bin/avdmanager`;
2121
const ADB_PATH = `${process.env.ANDROID_HOME}/platform-tools/adb`;
2222
/**

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/emulator-manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as exec from '@actions/exec';
22

3-
const EMULATOR_BOOT_TIMEOUT_SECONDS = 120;
3+
const EMULATOR_BOOT_TIMEOUT_SECONDS = 300;
44
const AVD_MANAGER_PATH = `${process.env.ANDROID_HOME}/tools/bin/avdmanager`;
55
const ADB_PATH = `${process.env.ANDROID_HOME}/platform-tools/adb`;
66

0 commit comments

Comments
 (0)