fix feedback bugs
CI / lint-backend (push) Successful in 1m27s
CI / lint-mobile (push) Successful in 10m24s
CI / test-backend (push) Successful in 1m33s
CI / test-mobile (push) Failing after 12m6s
CI / build-backend (push) Successful in 59s
CI / docker (push) Successful in 8s
CI / lint-backend (push) Successful in 1m27s
CI / lint-mobile (push) Successful in 10m24s
CI / test-backend (push) Successful in 1m33s
CI / test-mobile (push) Failing after 12m6s
CI / build-backend (push) Successful in 59s
CI / docker (push) Successful in 8s
This commit is contained in:
@@ -21,9 +21,32 @@ set -euo pipefail
|
||||
./gradlew :app:assembleDebug -q
|
||||
APK="app/build/outputs/apk/debug/app-debug.apk"
|
||||
if [ "${usage_target?}" = "emulator" ]; then
|
||||
adb -e install -r "$APK"
|
||||
ADB_FLAGS=(-e)
|
||||
else
|
||||
adb -d install -r "$APK"
|
||||
ADB_FLAGS=(-d)
|
||||
fi
|
||||
# adb natif s'il fonctionne (PATH + binaire exécutable sur cet OS)...
|
||||
if command -v adb >/dev/null 2>&1 && adb version >/dev/null 2>&1; then
|
||||
adb "${ADB_FLAGS[@]}" install -r "$APK"
|
||||
# ...sinon repli NixOS : l'adb du SDK est un binaire FHS dynamiquement
|
||||
# lié, on l'exécute via steam-run (cf. local.properties pour sdk.dir).
|
||||
elif command -v steam-run >/dev/null 2>&1; then
|
||||
SDK_DIR="${ANDROID_SDK_ROOT:-${ANDROID_HOME:-}}"
|
||||
if [ -z "$SDK_DIR" ] && [ -f local.properties ]; then
|
||||
SDK_DIR="$(sed -n 's/^sdk\.dir=//p' local.properties | head -n 1)"
|
||||
fi
|
||||
if [ -z "$SDK_DIR" ] && [ -d "$HOME/Android/Sdk" ]; then
|
||||
SDK_DIR="$HOME/Android/Sdk"
|
||||
fi
|
||||
if [ -z "$SDK_DIR" ] || [ ! -x "$SDK_DIR/platform-tools/adb" ]; then
|
||||
echo "adb introuvable : définissez ANDROID_HOME ou sdk.dir dans local.properties." >&2
|
||||
exit 1
|
||||
fi
|
||||
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$HOME/.nix-profile/lib:/run/opengl-driver/lib"
|
||||
steam-run "$SDK_DIR/platform-tools/adb" "${ADB_FLAGS[@]}" install -r "$APK"
|
||||
else
|
||||
echo "adb ne fonctionne pas sur cet OS et steam-run est absent (NixOS)." >&2
|
||||
exit 1
|
||||
fi
|
||||
'''
|
||||
|
||||
|
||||
Reference in New Issue
Block a user