Skip to content

Commit

Permalink
Merge branch 'master' into release/v1
Browse files Browse the repository at this point in the history
* master:
  Prepare for release 1.0.2
  Increase emulator boot timeout to 5 mins.
  Update npm packages.
  • Loading branch information
ychescale9 committed Nov 30, 2019
2 parents 6097e0a + 0d46bc0 commit 2174e7a
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 2 additions & 0 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`).
Expand All @@ -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`).
Expand Down
2 changes: 1 addition & 1 deletion lib/emulator-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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`;
/**
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/emulator-manager.ts
Original file line number Diff line number Diff line change
@@ -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`;

Expand Down

0 comments on commit 2174e7a

Please sign in to comment.