Skip to content

Commit e93c997

Browse files
committed
Merge branch 'master' into release/v2
* master: Prepare for release 2.9.0. Update test fixture dependencies. SDK Command-line Tools 2.0. Add information on running on Linux to README.md. Fix doc. Mention ci-matters repo in adopters list
2 parents 4f4106d + fc17953 commit e93c997

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## v2.9.0
4+
5+
* Updated to SDK command-line tools `2.0`.
6+
37
## v2.8.0
48

59
* Added support for specifying a custom name used for creating the **AVD** - [#59](https://github.com/ReactiveCircus/android-emulator-runner/issues/59).

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<a href="https://github.com/ReactiveCircus/android-emulator-runner"><img alt="GitHub Actions status" src="https://github.com/ReactiveCircus/android-emulator-runner/workflows/Main%20workflow/badge.svg"></a>
55
</p>
66

7-
A GitHub Action for installing, configuring and running hardware-accelerated Android Emulators on macOS virtual machines (or Linux virtual machines but without hardware accleration).
7+
A GitHub Action for installing, configuring and running hardware-accelerated Android Emulators on macOS virtual machines.
88

99
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).
1010

@@ -24,8 +24,6 @@ This action automates the process by doing the following:
2424

2525
It is recommended to run this action on a **macOS** VM, e.g. `macos-latest` or `macos-10.15` to take advantage of hardware accleration support provided by **HAXM**.
2626

27-
Please note that while Linux VMs (e.g. `ubuntu-latest` or `ubuntu-18.04`) are also supported, hardware acceleration will **not** be available.
28-
2927
A workflow that uses **android-emulator-runner** to run your instrumented tests on **API 29**:
3028

3129
```
@@ -88,8 +86,6 @@ jobs:
8886

8987
## Configurations
9088

91-
| | **Required** | **Default** | **Description** |
92-
|----------------------|--------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
9389
| | **Required** | **Default** | **Description** |
9490
|----------------------|--------------|-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
9591
| `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**. |
@@ -107,7 +103,12 @@ jobs:
107103

108104
Default `emulator-options`: `-no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim`.
109105

110-
_Please note that if you are running on a Linux VM, `-no-accel` will be added to the `emulator-options` to make sure hardware acceleration is turned off._
106+
## Can I use this action on Linux VMs?
107+
108+
The short answer is yes but it's expected to be a much worse experience (on some newer API levels it might not work at all) than running it on macOS.
109+
110+
For a longer answer please refer to [this issue](https://github.com/ReactiveCircus/android-emulator-runner/issues/46).
111+
111112

112113
## Who is using Android Emulator Runner?
113114

@@ -126,5 +127,6 @@ These are some of the open-source projects using (or used) **Android Emulator Ru
126127
- [ReactiveCircus/FlowBinding](https://github.com/ReactiveCircus/FlowBinding)
127128
- [vinaygaba/Learn-Jetpack-Compose-By-Example](https://github.com/vinaygaba/Learn-Jetpack-Compose-By-Example/)
128129
- [ashishb/adb-enhanced](https://github.com/ashishb/adb-enhanced/tree/master/.github/workflows)
130+
- [vgaidarji/ci-matters](https://github.com/vgaidarji/ci-matters/blob/master/.github/workflows/main.yaml)
129131

130132
If you are using **Android Emulator Runner** and want your project included in the list, please feel free to create an issue or open a pull request.

lib/sdk-installer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
1818
const core = __importStar(require("@actions/core"));
1919
const exec = __importStar(require("@actions/exec"));
2020
const BUILD_TOOLS_VERSION = '29.0.3';
21-
const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip';
22-
const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
21+
const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip';
22+
const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip';
2323
/**
2424
* Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
2525
* and the system image for the chosen API level, CPU arch, and target.

src/sdk-installer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import * as core from '@actions/core';
22
import * as exec from '@actions/exec';
33

44
const BUILD_TOOLS_VERSION = '29.0.3';
5-
const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip';
6-
const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip';
5+
const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-6514223_latest.zip';
6+
const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip';
77

88
/**
99
* Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,

test-fixture/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
implementation fileTree(dir: 'libs', include: ['*.jar'])
2929
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
3030
implementation 'androidx.appcompat:appcompat:1.1.0'
31-
implementation 'androidx.core:core-ktx:1.2.0'
31+
implementation 'androidx.core:core-ktx:1.3.0'
3232
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3333
testImplementation 'junit:junit:4.13'
3434
androidTestImplementation 'androidx.test.ext:junit:1.1.1'

test-fixture/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.6.2'
10+
classpath 'com.android.tools.build:gradle:4.0.0'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

1313
// NOTE: Do not place your application dependencies here; they belong

0 commit comments

Comments
 (0)