hernani/koopa-admin-log
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

monitoring: use inference fix branch by default; harden GUI chain ANR wait

Browse source 
Default BUILD branch fix-bank-withdraw-auto-exchange; dismiss System UI
ANR before confirm taps so low-RAM emulators fail less uselessly.
This commit is contained in:
Hernâni Marques 2026-07-17 21:22:45 +02:00
parent 2dfd40558a
commit 92695c0ee3
No known key found for this signature in database
6 changed files with 55 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
scripts/taler-monitoring/android-test/run-android-build-and-smoke.sh
View file

@ -19,6 +19,9 @@ ROOT=$(cd "$(dirname "$0")" && pwd)
SMOKE="$ROOT/run-android-pay-smoke.sh"
SRC="${TALER_ANDROID_SRC:-$HOME/taler/taler-android}"
SKIP_PULL="${SKIP_PULL:-0}"
# Prefer existing inference fix branch for GOA withdraw (spinner/exchange resolve).
# Override: BRANCH=master or BRANCH=dev/hernani-inference/fix-withdraw-spinner-fallback
BRANCH="${BRANCH:-dev/hernani-inference/fix-bank-withdraw-auto-exchange}"
VARIANT="${VARIANT:-fdroidDebug}" # assemble task suffix: FdroidDebug / NightlyDebug / …
export ANDROID_HOME="${ANDROID_HOME:-$HOME/Android/Sdk}"
export ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT:-$ANDROID_HOME}"
@ -35,13 +38,19 @@ fi
printf 'sdk.dir=%s\n' "$ANDROID_HOME" >"$SRC/local.properties"
cd "$SRC"
if [ "$SKIP_PULL" != "1" ] && [ -d .git ]; then
echo "git pull --ff-only origin $(git rev-parse --abbrev-ref HEAD)"
git pull --ff-only origin "$(git rev-parse --abbrev-ref HEAD)" || \
git fetch origin && git merge --ff-only "origin/$(git rev-parse --abbrev-ref HEAD)" || true
if [ -d .git ]; then
git fetch origin 2>/dev/null || true
if [ -n "$BRANCH" ] && git rev-parse --verify "origin/$BRANCH" >/dev/null 2>&1; then
echo "checkout origin/$BRANCH (minimal GOA/automation fixes; override BRANCH=)"
git checkout -B "$BRANCH" "origin/$BRANCH" 2>/dev/null || git checkout "$BRANCH" 2>/dev/null || true
fi
if [ "$SKIP_PULL" != "1" ]; then
br=$(git rev-parse --abbrev-ref HEAD)
git pull --ff-only origin "$br" 2>/dev/null || true
fi
fi
COMMIT=$(git rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
echo "source: $SRC @ $COMMIT"
echo "source: $SRC @ $COMMIT (branch $(git rev-parse --abbrev-ref HEAD 2>/dev/null || ?))"
echo "variant: assemble${VARIANT^}" 2>/dev/null || true
# Map VARIANT → gradle task (fdroidDebug → assembleFdroidDebug)