Extract Android template download to script

Author: limbonaut

.github/workflows/test_android.yml

@@ -21,27 +21,10 @@ jobs:
         with:
           arch: x86_64
 
-      # TODO: move to prepare testing
-      - name: Download Android template
-        shell: bash
+      - name: Deploy Android build template
         env:
           GODOT_VERSION: 4.5.1-stable
-        run: |
-          archive_file=Godot_v${GODOT_VERSION}_export_templates.tpz
-          url=https://github.com/godotengine/godot-builds/releases/download/${GODOT_VERSION}/${archive_file}
-          curl -L -o templates.zip "${url}"
-          unzip -j templates.zip templates/android_source.zip -d exports/
-          rm templates.zip
-
-          # TODO: need to cache it
-
-          mkdir -p project/android/build
-          unzip exports/android_source.zip -d project/android/build
-
-          # NOTE: Godot expects build version file
-          echo "../exports/android_source.zip [$(md5sum exports/android_source.zip | cut -d' ' -f1)]" > project/android/.build_version
-
-          ls -lR project/android/
+        run: ./scripts/deploy-android-template.sh $GODOT_VERSION
 
       - name: Export project
         shell: bash
@@ -51,7 +34,6 @@ jobs:
           SENTRY_TEST_INCLUDE: "res://test/suites/"
         run: |
           cp exports/export_presets.cfg project/export_presets.cfg
-          mkdir -p exports/android/
           ${GODOT} --path project/ --headless --export-debug "Android CI" ${GITHUB_WORKSPACE}/exports/android.apk
 
           ls -lR exports/

scripts/run-android-tests.sh

@@ -1,17 +1,12 @@
 #!/bin/bash
-#
 # Run unit tests on a local Android device.
-#
-# Prerequisites:
-# - Godot Engine 4.5 or later with Android export templates installed
-# - Android SDK with ADB (Android Debug Bridge) tools
-# - Android device connected and authorized for debugging
 
 # Configuration
-TEST_TIMEOUT=60  # seconds
+TEST_TIMEOUT=120  # seconds
 INSTALL_RETRIES=5
 LAUNCH_RETRIES=3
 LOCKSCREEN_RETRIES=20
+LOGCAT_FILTERS="Godot,godot,sentry-godot,sentry-native"
 
 # Formatted output
 highlight() { echo -e "\033[1;34m$1\033[0m"; }
@@ -35,6 +30,51 @@ abort() {
 	exit 1
 }
 
+# Display usage information
+usage() {
+    echo "Usage: $0 [OPTIONS]"
+    echo ""
+    echo "Run unit tests on a local Android device."
+    echo ""
+    echo "OPTIONS:"
+    echo "  -v, --verbose    Enable additional output"
+    echo "  -h, --help       Display this help message"
+    echo ""
+    echo "PREREQUISITES:"
+    echo "  - Godot Engine 4.5 or later with Android export templates installed"
+    echo "  - Android SDK with ADB (Android Debug Bridge) tools"
+    echo "  - Android device connected and authorized for debugging"
+    echo ""
+    echo "ENVIRONMENT VARIABLES:"
+    echo "  GODOT           Path to Godot executable (if not in PATH)"
+}
+
+# Parse command line options
+verbose=false
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --verbose|-v)
+            verbose=true
+            shift
+            ;;
+        --help|-h)
+            usage
+            exit 0
+            ;;
+        -*)
+            error "Unknown option: $1"
+            usage
+            exit 1
+            ;;
+        *)
+            error "Unexpected argument: $1"
+            usage
+            exit 1
+            ;;
+    esac
+done
+
 highlight "Exporting project..."
 
 # Export project to "exports/android.apk".
@@ -61,6 +101,10 @@ for i in $(seq 1 $INSTALL_RETRIES); do
     fi
 done
 
+# Enable Sentry Android output if verbose
+if [ "$verbose" = true ]; then
+      LOGCAT_FILTERS="$LOGCAT_FILTERS,Sentry"
+fi
 
 # Run tests on device
 run_tests() {
@@ -105,7 +149,7 @@ run_tests() {
 	highlight "Reading logs..."
 
 	local exit_code=1  # Default general failure
-	local clean_exit=0
+	local clean_exit=false
 
 	# Process logcat output
 	while IFS= read -r line; do
@@ -119,11 +163,11 @@ run_tests() {
 
 	    # Check Godot exit condition
 		if echo "$line" | grep -q "OnGodotTerminating"; then
-			clean_exit=1
+			clean_exit=true
             timeout 2 cat || true  # Continue reading for a bit in case there are remaining logs
 	        break
 	    fi
-	done < <(timeout $TEST_TIMEOUT adb logcat --pid=$pid -s Godot,godot,sentry-godot,sentry-native)
+	done < <(timeout $TEST_TIMEOUT adb logcat --pid=$pid -s $LOGCAT_FILTERS)
 
 	# Check if never finished
 	if [ $exit_code -eq 1 ]; then
@@ -138,7 +182,7 @@ run_tests() {
      	fi
         error "Godot app process still running"
     # Check if not exited cleanly
-	elif [ $clean_exit -eq 0 ]; then
+	elif [ "$clean_exit" = false ]; then
 		warning "Unclean exit detected. Godot possibly crashed."
     fi