sycn with upstream 50986b1464923454c95e261820bc626f38490ec0

.github/workflows/main.yml

@@ -61,11 +61,11 @@ jobs:
  npm run lint
  npm test
 
- - name: Java 15
- uses: actions/setup-java@v3
+ - uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
- java-version: 15
+ java-version: 19
+
  - uses: actions/cache@v3
  id: avd-cache
  with:

.github/workflows/manually.yml

@@ -51,17 +51,14 @@ jobs:
  npm run lint
  npm test
 
- - name: Java 15
- uses: actions/setup-java@v3
+ - uses: actions/setup-java@v3
  with:
  distribution: 'zulu'
- java-version: 15
- - uses: actions/cache@v3
+ java-version: 19
+
+ - uses: gradle/gradle-build-action@v2
  with:
- path: |
- ~/.gradle/caches
- ~/.gradle/wrapper
- key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
+ gradle-home-cache-cleanup: true
 
  - name: run action
  uses: ./

.gitignore

@@ -1,7 +1,7 @@
 __tests__/runner/*
 
 # comment out in distribution branches
-node_modules/
+# node_modules/
 
 # Rest pulled from https://github.com/github/gitignore/blob/master/Node.gitignore
 # Logs

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## v2.28.0
+
+* Add `emulator-boot-timeout` to support configuring maximum time waiting for emulator boot. - [#326](https://github.com/ReactiveCircus/android-emulator-runner/pull/326)
+* Support non-integer `api-level`. - [#317](https://github.com/ReactiveCircus/android-emulator-runner/pull/317)
+* Replace deprecated `ANDROID_SDK_ROOT` with `ANDROID_HOME`. - [304](https://github.com/ReactiveCircus/android-emulator-runner/pull/304)
+* Update SDK command-line tools to `9.0`. - [#331](https://github.com/ReactiveCircus/android-emulator-runner/pull/331)
+* Update SDK build tools to `33.0.2`. - [#331](https://github.com/ReactiveCircus/android-emulator-runner/pull/331)
+
 ## v2.27.0
 
 * Added `pre-emulator-launch-script` to support running script after creating the AVD and before launching the emulator. - [#247](https://github.com/ReactiveCircus/android-emulator-runner/pull/247) @nilsreichardt.

README.md

@@ -154,6 +154,7 @@ jobs:
 | `disk-size` | Optional | N/A | Disk size, or partition size to use for this AVD. Either in bytes or KB, MB or GB, when denoted with K, M or G. - e.g. `2048M` |
 | `avd-name` | Optional | `test` | Custom AVD name used for creating the Android Virtual Device. |
 | `force-avd-creation` | Optional | `true` | Whether to force create the AVD by overwriting an existing AVD with the same name as `avd-name` - `true` or `false`. |
+| `emulator-boot-timeout` | Optional | `600` | Emulator boot timeout in seconds. If it takes longer to boot, the action would fail - e.g. `300` for 5 minutes. |
 | `emulator-options` | Optional | See below | Command-line options used when launching the emulator (replacing all default options) - e.g. `-no-window -no-snapshot -camera-back emulated`. |
 | `disable-animations` | Optional | `true` | Whether to disable animations - `true` or `false`. |
 | `disable-spellchecker` | Optional | `false` | Whether to disable spellchecker - `true` or `false`. |

__tests__/input-validator.test.ts

@@ -32,6 +32,14 @@ describe('api-level validator tests', () => {
  validator.checkApiLevel('29');
  };
  expect(func2).not.toThrow();
+ const func3 = () => {
+ validator.checkApiLevel('UpsideDownCake-ext5');
+ };
+ expect(func3).not.toThrow();
+ const func4 = () => {
+ validator.checkApiLevel('TiramisuPrivacySandbox');
+ };
+ expect(func4).not.toThrow();
  });
 });
 

action-types.yml

@@ -35,6 +35,8 @@ inputs:
  type: string
  force-avd-creation:
  type: boolean
+ emulator-boot-timeout:
+ type: integer
  emulator-options:
  type: string
  disable-animations:

action.yml

@@ -33,6 +33,9 @@ inputs:
  force-avd-creation:
  description: 'whether to force create the AVD by overwriting an existing AVD with the same name as `avd-name` - `true` or `false`'
  default: 'true'
+ emulator-boot-timeout:
+ description: 'Emulator boot timeout in seconds. If it takes longer to boot, the action would fail - e.g. `300` for 5 minutes'
+ default: '600'
  emulator-options:
  description: 'command-line options used when launching the emulator - e.g. `-no-window -no-snapshot -camera-back emulated`'
  default: '-no-window -gpu swiftshader_indirect -no-snapshot -noaudio -no-boot-anim'

lib/emulator-manager.js

@@ -35,11 +35,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.killEmulator = exports.launchEmulator = void 0;
 const exec = __importStar(require("@actions/exec"));
 const fs = __importStar(require("fs"));
-const EMULATOR_BOOT_TIMEOUT_SECONDS = 600;
 /**
  * Creates and launches a new AVD instance with the specified configurations.
  */
-function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, heapSize, sdcardPathOrSize, diskSize, avdName, forceAvdCreation, emulatorOptions, disableAnimations, disableSpellChecker, disableLinuxHardwareAcceleration, enableHardwareKeyboard) {
+function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, heapSize, sdcardPathOrSize, diskSize, avdName, forceAvdCreation, emulatorBootTimeout, emulatorOptions, disableAnimations, disableSpellChecker, disableLinuxHardwareAcceleration, enableHardwareKeyboard) {
  return __awaiter(this, void 0, void 0, function* () {
  try {
  console.log(`::group::Launch Emulator`);
@@ -84,7 +83,7 @@ function launchEmulator(apiLevel, target, arch, profile, cores, ramSize, heapSiz
  },
  });
  // wait for emulator to complete booting
- yield waitForDevice();
+ yield waitForDevice(emulatorBootTimeout);
  yield exec.exec(`adb shell input keyevent 82`);
  if (disableAnimations) {
  console.log('Disabling animations.');
@@ -126,12 +125,12 @@ exports.killEmulator = killEmulator;
 /**
  * Wait for emulator to boot.
  */
-function waitForDevice() {
+function waitForDevice(emulatorBootTimeout) {
  return __awaiter(this, void 0, void 0, function* () {
  let booted = false;
  let attempts = 0;
  const retryInterval = 2; // retry every 2 seconds
- const maxAttempts = EMULATOR_BOOT_TIMEOUT_SECONDS / 2;
+ const maxAttempts = emulatorBootTimeout / 2;
  while (!booted) {
  try {
  let result = '';

lib/input-validator.js

@@ -6,6 +6,8 @@ exports.VALID_TARGETS = ['default', 'google_apis', 'aosp_atd', 'google_atd', 'go
 exports.VALID_ARCHS = ['x86', 'x86_64', 'arm64-v8a'];
 exports.VALID_CHANNELS = ['stable', 'beta', 'dev', 'canary'];
 function checkApiLevel(apiLevel) {
+ if (apiLevel.startsWith('UpsideDownCake') || apiLevel === 'TiramisuPrivacySandbox')
+ return;
  if (isNaN(Number(apiLevel)) || !Number.isInteger(Number(apiLevel))) {
  throw new Error(`Unexpected API level: '${apiLevel}'.`);
  }

lib/main.js

@@ -61,9 +61,8 @@ function run() {
  }
  }
  // API level of the platform and system image
- const apiLevelInput = core.getInput('api-level', { required: true });
- (0, input_validator_1.checkApiLevel)(apiLevelInput);
- const apiLevel = Number(apiLevelInput);
+ const apiLevel = core.getInput('api-level', { required: true });
+ (0, input_validator_1.checkApiLevel)(apiLevel);
  console.log(`API level: ${apiLevel}`);
  // target of the system image
  const targetInput = core.getInput('target');
@@ -100,6 +99,9 @@ function run() {
  (0, input_validator_1.checkForceAvdCreation)(forceAvdCreationInput);
  const forceAvdCreation = forceAvdCreationInput === 'true';
  console.log(`force avd creation: ${forceAvdCreation}`);
+ // Emulator boot timeout seconds
+ const emulatorBootTimeout = parseInt(core.getInput('emulator-boot-timeout'), 10);
+ console.log(`Emulator boot timeout: ${emulatorBootTimeout}`);
  // emulator options
  const emulatorOptions = core.getInput('emulator-options').trim();
  console.log(`emulator options: ${emulatorOptions}`);
@@ -191,7 +193,7 @@ function run() {
  console.log(`::endgroup::`);
  }
  // launch an emulator
- yield (0, emulator_manager_1.launchEmulator)(apiLevel, target, arch, profile, cores, ramSize, heapSize, sdcardPathOrSize, diskSize, avdName, forceAvdCreation, emulatorOptions, disableAnimations, disableSpellchecker, disableLinuxHardwareAcceleration, enableHardwareKeyboard);
+ yield (0, emulator_manager_1.launchEmulator)(apiLevel, target, arch, profile, cores, ramSize, heapSize, sdcardPathOrSize, diskSize, avdName, forceAvdCreation, emulatorBootTimeout, emulatorOptions, disableAnimations, disableSpellchecker, disableLinuxHardwareAcceleration, enableHardwareKeyboard);
  // execute the custom script
  try {
  // move to custom working directory if set

lib/sdk-installer.js

@@ -38,9 +38,10 @@ const exec = __importStar(require("@actions/exec"));
 const io = __importStar(require("@actions/io"));
 const tc = __importStar(require("@actions/tool-cache"));
 const fs = __importStar(require("fs"));
-const BUILD_TOOLS_VERSION = '33.0.0';
-const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-9123335_latest.zip';
-const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-9123335_latest.zip';
+const BUILD_TOOLS_VERSION = '33.0.2';
+// SDK command-line tools 9.0
+const CMDLINE_TOOLS_URL_MAC = 'https://dl.google.com/android/repository/commandlinetools-mac-9477386_latest.zip';
+const CMDLINE_TOOLS_URL_LINUX = 'https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip';
 /**
  * Installs & updates the Android SDK for the macOS platform, including SDK platform for the chosen API level, latest build tools, platform tools, Android Emulator,
  * and the system image for the chosen API level, CPU arch, and target.
@@ -68,7 +69,7 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk
  // accept all Android SDK licenses
  yield exec.exec(`sh -c \\"yes | sdkmanager --licenses > /dev/null"`);
  console.log('Installing latest build tools, platform tools, and platform.');
- yield exec.exec(`sh -c \\"sdkmanager --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools 'platforms;android-${apiLevel}' > /dev/null"`);
+ yield exec.exec(`sh -c \\"sdkmanager --install 'build-tools;${BUILD_TOOLS_VERSION}' platform-tools > /dev/null"`);
  console.log('Installing latest emulator.');
  yield exec.exec(`sh -c \\"sdkmanager --install emulator --channel=${channelId} > /dev/null"`);
  if (emulatorBuild) {