mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-21 05:46:03 +00:00
fix(lab): target the active app package and repair build setup (#2494)
* fix(lab): handle SDK licenses and cache Gradle planning * fix(lab): target the package owning the agent session * fix(lab): preserve package overrides across build handoff
This commit is contained in:
1 parent
ea48036811
commit
2953739f1e
4 files changed
+100
-7
No files matched your search
@@ -5,12 +5,17 @@
|
||||
# compile what changed. Setup runs it once; it takes the longest.
|
||||
# --explain logs why each task ran and Kotlin's build report, to find out what makes a build slow.
|
||||
set -euo pipefail
|
||||
pkg=com.droiddeck.launcher
|
||||
pkg=${DROIDDECK_PACKAGE:-}
|
||||
if [ -z "$pkg" ] && [[ ${DD_AGENT_INBOX:-} =~ ^/data/(user/[0-9]+|data)/([^/]+)/files/agent$ ]]; then
|
||||
pkg=${BASH_REMATCH[2]}
|
||||
fi
|
||||
pkg=${pkg:-com.droiddeck.launcher}
|
||||
serial=${ADB_SERIAL:-127.0.0.1:5555}
|
||||
mode=build
|
||||
explain=()
|
||||
for arg in "$@"; do
|
||||
case $arg in
|
||||
--package=*) pkg=${arg#--package=} ;;
|
||||
--no-restart) mode=no-restart ;;
|
||||
--prepare) mode=prepare ;;
|
||||
--explain) explain=(--info -Pkotlin.build.report.output=file) ;;
|
||||
@@ -31,16 +36,18 @@ progress() { # stage [permille task done total eta]
|
||||
fail() { progress failed 0 "$*"; echo "dd-lab-build: $*" >&2; exit 1; }
|
||||
trap 'progress failed 0 stopped; exit 143' INT TERM
|
||||
trap 'progress failed 0 "a command failed on line $LINENO"' ERR
|
||||
[[ $pkg =~ ^[A-Za-z][A-Za-z0-9_]*(\.[A-Za-z][A-Za-z0-9_]*)+$ ]] || fail "invalid Android package: $pkg"
|
||||
export DROIDDECK_PACKAGE=$pkg
|
||||
device() { adb -s "$serial" shell "$@" | tr -d '\r'; }
|
||||
|
||||
# The app's agent loses every process it started when its turn ends, a build included, so it asks
|
||||
# the app to run the build in a process of its own and follows that build here.
|
||||
agent=/data/user/0/$pkg/files/agent
|
||||
agent=${DD_AGENT_INBOX:-/data/user/0/$pkg/files/agent}
|
||||
if [ -n "${DD_AGENT:-}" ] && [ -z "${DD_LAB_DETACHED:-}" ] && [ -d "$agent" ]; then
|
||||
trap - ERR
|
||||
log=$cache/dd-lab-build.log
|
||||
rm -f "$progress_file"
|
||||
python3 -c 'import json,os,sys; print(json.dumps({"cwd": os.getcwd(), "args": sys.argv[1:]}))' "$@" > "$agent/lab-request.part"
|
||||
python3 -c 'import json,os,sys; print(json.dumps({"cwd": os.getcwd(), "args": [*sys.argv[1:], "--package=" + os.environ["DROIDDECK_PACKAGE"]]}))' "$@" > "$agent/lab-request.part"
|
||||
mv "$agent/lab-request.part" "$agent/lab-request"
|
||||
echo "DroidDeck runs this build itself, so it keeps going if this turn ends. Its log follows."
|
||||
for _ in $(seq 1 30); do [ -f "$progress_file" ] && break; sleep 1; done
|
||||
@@ -102,7 +109,7 @@ export DROIDDECK_SOURCE_COMMIT=$base DROIDDECK_BUILD_LABEL="lab on $installed_la
|
||||
printf 'sdk.dir=%s\n' "$ANDROID_HOME" > local.properties
|
||||
if [ ! -d "$ANDROID_HOME/platforms/android-34" ]; then
|
||||
progress sdk
|
||||
yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null
|
||||
(set +o pipefail; yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null)
|
||||
"$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null
|
||||
fi
|
||||
|
||||
@@ -125,7 +132,19 @@ gradle=(./gradlew :app:processReleaseResources :app:mergeDexRelease --max-worker
|
||||
-Pandroid.aapt2FromMavenOverride=$HOME/aapt2/aapt2 -Pkotlin.compiler.execution.strategy=daemon
|
||||
-Pkotlin.daemon.jvmargs=-Xmx${kotlin_heap}m -Dorg.gradle.jvmargs=-Xmx${gradle_heap}m --console=plain)
|
||||
progress planning
|
||||
mapfile -t plan < <("${gradle[@]}" --dry-run -q 2>/dev/null | awk '/^:/ {print $1}' || true)
|
||||
plan_file=$cache/dd-lab-build-plan
|
||||
plan_key=$(
|
||||
{
|
||||
printf '%s\n' "$repo" "${gradle[@]}"
|
||||
git ls-files -z -- '*gradle*' | xargs -0 -r sha256sum
|
||||
} | sha256sum | cut -d ' ' -f1
|
||||
)
|
||||
if [ "$(head -n 1 "$plan_file" 2>/dev/null)" != "$plan_key" ]; then
|
||||
plan_output=$("${gradle[@]}" --dry-run) || fail "Gradle planning failed: $plan_output"
|
||||
{ printf '%s\n' "$plan_key"; awk '/^:/ {print $1}' <<<"$plan_output"; } > "$plan_file.part"
|
||||
mv "$plan_file.part" "$plan_file"
|
||||
fi
|
||||
mapfile -t plan < <(tail -n +2 "$plan_file")
|
||||
total=${#plan[@]}
|
||||
|
||||
# Each task's estimate is how long it took last time; a full compile of the app takes about 15 minutes.
|
||||
@@ -221,6 +240,6 @@ device cmd package compile -m verify -f $pkg >/dev/null
|
||||
progress restarting 1000 "$name"
|
||||
echo "Restarting DroidDeck on the Lab build; it shows a notification when it is back"
|
||||
# The app's own agent ends with the app, so it is told to carry on once the app is back.
|
||||
if [ -n "${DD_AGENT:-}" ]; then mkdir -p "/data/user/0/$pkg/files/agent" && : > "/data/user/0/$pkg/files/agent/resume"; fi
|
||||
if [ -n "${DD_AGENT:-}" ]; then mkdir -p "$agent" && : > "$agent/resume"; fi
|
||||
device "nohup sh -c 'sleep 3; monkey -p $pkg -c android.intent.category.LAUNCHER 1' >/dev/null 2>&1 &"
|
||||
for pid in $(device pidof $pkg); do kill "$pid" 2>/dev/null || true; done
|
||||
+1
-1
@@ -61,7 +61,7 @@ if [ ! -x "$sdk/cmdline-tools/latest/bin/sdkmanager" ]; then
|
||||
mv "$sdk/cmdline-tools/cmdline-tools" "$sdk/cmdline-tools/latest"
|
||||
fi
|
||||
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-arm64
|
||||
yes | "$sdk/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null
|
||||
(set +o pipefail; yes | "$sdk/cmdline-tools/latest/bin/sdkmanager" --licenses >/dev/null)
|
||||
"$sdk/cmdline-tools/latest/bin/sdkmanager" "platforms;android-34" "build-tools;35.0.0" >/dev/null
|
||||
|
||||
adb connect 127.0.0.1:5555 || true
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
import subprocess
|
||||
import tempfile
|
||||
import time
|
||||
import unittest
|
||||
|
||||
|
||||
SCRIPT = Path(__file__).resolve().parents[1] / 'agent/dd-lab-build'
|
||||
|
||||
|
||||
class LabBuildPackageTest(unittest.TestCase):
|
||||
def test_package_override_survives_app_handoff_without_its_environment(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
root = Path(tmp)
|
||||
inbox = root / 'agent'
|
||||
inbox.mkdir()
|
||||
cache = root / '.cache'
|
||||
env = {**os.environ, 'HOME': tmp, 'DD_AGENT': '1',
|
||||
'DD_AGENT_INBOX': str(inbox), 'DROIDDECK_PACKAGE': 'com.example.target'}
|
||||
env.pop('DD_LAB_DETACHED', None)
|
||||
child = subprocess.Popen(['bash', str(SCRIPT), '--prepare'], env=env,
|
||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
|
||||
try:
|
||||
request = inbox / 'lab-request'
|
||||
deadline = time.monotonic() + 10
|
||||
while not request.exists() and child.poll() is None and time.monotonic() < deadline:
|
||||
time.sleep(0.01)
|
||||
self.assertTrue(request.exists())
|
||||
payload = json.loads(request.read_text())
|
||||
self.assertEqual(['--prepare', '--package=com.example.target'], payload['args'])
|
||||
progress = cache / 'dd-lab-build.json'
|
||||
progress.write_text('{"stage":"prepared"}')
|
||||
stdout, stderr = child.communicate(timeout=10)
|
||||
self.assertEqual(0, child.returncode, stdout + stderr)
|
||||
finally:
|
||||
if child.poll() is None:
|
||||
child.kill()
|
||||
child.communicate()
|
||||
|
||||
bin_dir = root / 'bin'
|
||||
bin_dir.mkdir()
|
||||
(bin_dir / 'adb').write_text('#!/bin/sh\nexit 0\n')
|
||||
(bin_dir / 'python3').write_text(
|
||||
'#!/bin/sh\nprintf "%s" "$DROIDDECK_PACKAGE" > "$HOME/selected-package"\nexit 1\n')
|
||||
for tool in bin_dir.iterdir():
|
||||
tool.chmod(0o755)
|
||||
env.pop('DROIDDECK_PACKAGE')
|
||||
env['DD_LAB_DETACHED'] = '1'
|
||||
env['PATH'] = str(bin_dir) + os.pathsep + env['PATH']
|
||||
result = subprocess.run(['bash', str(SCRIPT), *payload['args']], env=env,
|
||||
capture_output=True, text=True, timeout=10, cwd=SCRIPT.parents[2])
|
||||
self.assertNotEqual(0, result.returncode)
|
||||
self.assertIn('could not read DroidDeck', result.stderr)
|
||||
self.assertEqual('com.example.target', (root / 'selected-package').read_text())
|
||||
|
||||
def test_invalid_packages_are_rejected_before_handoff(self):
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
inbox = Path(tmp) / 'agent'
|
||||
inbox.mkdir()
|
||||
for package in ('bad;touch injected', '../other', '', 'com.example/other'):
|
||||
with self.subTest(package=package):
|
||||
env = {**os.environ, 'HOME': tmp, 'DD_AGENT': '1', 'DD_AGENT_INBOX': str(inbox)}
|
||||
result = subprocess.run(['bash', str(SCRIPT), '--package=' + package], env=env,
|
||||
capture_output=True, text=True, timeout=10)
|
||||
self.assertNotEqual(0, result.returncode)
|
||||
self.assertIn('invalid Android package', result.stderr)
|
||||
self.assertFalse((inbox / 'lab-request').exists())
|
||||
Reference in new issue
Block a user