CRT/storebound
1
0
Fork 0
Code Issues Pull requests Releases 1 Packages 1 Activity Actions

play build: find the Android SDK like Android Studio (ANDROID_HOME, ANDROID_SDK_ROOT, sdk.dir, default folder), pass it in the env, stop before Gradle when missing; doctor shows it. apple upload: size, per-part lines, 20 s heartbeat (api, altool, processing wait), per-part and per-call timeouts, --timeout exits 7 with the resume hint. Pitfall 25

Browse source
This commit is contained in:
CRTkafa 2026-10-12 08:48:02 +08:00
parent 366362d62b
commit fc524cd2d4
15 changed files with 460 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

32
tests/tools-path.test.ts
View file

@ -2,7 +2,7 @@ import { describe, expect, test } from 'bun:test';
import { mkdirSync, mkdtempSync } from 'node:fs';
import { tmpdir } from 'node:os';
import { join } from 'node:path';
import { toolPath, wellKnownToolDirs } from '../cli/lib/tools';
import { androidSdkEnv, androidSdkMissing, resolveAndroidSdk, sdkDirOf, toolPath, wellKnownToolDirs } from '../cli/lib/tools';
describe('tool folders outside PATH', () => {
test('finds the Android SDK Android Studio installs, after the own PATH', () => {
@ -16,6 +16,36 @@ describe('tool folders outside PATH', () => {
expect(p).toContain(join(home, 'Library/Android/sdk/emulator'));
});
test('Android SDK: env, then local.properties, then the Android Studio folder; only real SDK folders count', () => {
const fs = (dirs: string[], files: Record<string, string> = {}) => ({
exists: (p: string) => dirs.includes(p) || p in files || dirs.some(d => d.startsWith(p + '/')), readText: (p: string) => files[p] ?? null });
const home = '/x/home';
const studio = `${home}/Library/Android/sdk`;
// non-interactive shell on macOS: no ANDROID_HOME, local.properties gitignored -> Android Studio's folder
let r = resolveAndroidSdk({ env: {}, platform: 'darwin', home, gradleDirs: ['/p/android'], ...fs([`${studio}/platform-tools`]) });
expect(r).toMatchObject({ path: studio, source: 'default' });
expect(r.checked).toEqual(['ANDROID_HOME: not set', 'ANDROID_SDK_ROOT: not set', 'sdk.dir in /p/android/local.properties: not set', `Android Studio default folder: ${studio}`]);
// ANDROID_HOME pointing at an empty folder is skipped, ANDROID_SDK_ROOT is used
r = resolveAndroidSdk({ env: { ANDROID_HOME: '/empty', ANDROID_SDK_ROOT: '/sdk' }, platform: 'linux', home, ...fs(['/empty', '/sdk/platforms']) });
expect(r).toMatchObject({ path: '/sdk', source: 'ANDROID_SDK_ROOT' });
expect(r.checked[0]).toBe('ANDROID_HOME: /empty (no platforms/ or platform-tools/ in it)');
// sdk.dir with Java properties escapes
r = resolveAndroidSdk({ env: {}, platform: 'linux', home, gradleDirs: ['/p/android'], ...fs(['/opt/and:sdk/platforms'], { '/p/android/local.properties': '## comment\nsdk.dir=/opt/and\\:sdk\n' }) });
expect(r).toMatchObject({ path: '/opt/and:sdk', source: 'local.properties' });
expect(sdkDirOf('sdk.dir=C\\:\\\\Users\\\\dev\\\\AppData\\\\Local\\\\Android\\\\Sdk')).toBe('C:\\Users\\dev\\AppData\\Local\\Android\\Sdk');
// Linux and Windows defaults
expect(resolveAndroidSdk({ env: {}, platform: 'linux', home: '/x/linuxhome', ...fs(['/x/linuxhome/Android/Sdk/platforms']) }).path).toBe('/x/linuxhome/Android/Sdk');
expect(resolveAndroidSdk({ env: { LOCALAPPDATA: 'C:\\Users\\dev\\AppData\\Local' }, platform: 'win32', home: 'C:\\Users\\dev', exists: p => p === 'C:\\Users\\dev\\AppData\\Local\\Android\\Sdk\\platform-tools', readText: () => null }).path)
.toBe('C:\\Users\\dev\\AppData\\Local\\Android\\Sdk');
// nothing anywhere: every place checked is named in the error, and nothing goes to Gradle
r = resolveAndroidSdk({ env: {}, platform: 'darwin', home, gradleDirs: ['/p/android'], ...fs([]) });
expect(r.path).toBeNull();
expect(androidSdkEnv(r)).toEqual({});
const msg = androidSdkMissing(r);
for (const where of ['ANDROID_HOME', 'ANDROID_SDK_ROOT', '/p/android/local.properties', studio]) expect(msg).toContain(where);
expect(androidSdkEnv({ path: '/sdk', source: 'default', checked: [] })).toEqual({ ANDROID_HOME: '/sdk', ANDROID_SDK_ROOT: '/sdk' });
});
test('ANDROID_HOME wins, missing folders are skipped, app folders come first', () => {
const sdk = mkdtempSync(join(tmpdir(), 'sb-sdk-'));
mkdirSync(join(sdk, 'platform-tools'));