change memory settings on github and retry bundle if fails

Author: tommasini

android/gradle.properties.github

@@ -1,16 +1,17 @@
 # GitHub Actions-specific Gradle settings
-# High-performance settings for 64GB/16CPU runners
+# Optimized for E2E builds on GitHub Actions runners
 
-# JVM configuration - high-performance for GitHub Actions
-org.gradle.jvmargs=-Xmx32g -XX:MaxMetaspaceSize=2g -XX:+UseG1GC -XX:G1HeapRegionSize=32m -XX:+UseStringDeduplication -XX:+OptimizeStringConcat
+# JVM configuration - balanced settings to avoid OOM while maintaining performance
+# Using 16GB heap to leave room for parallel workers and native memory
+org.gradle.jvmargs=-Xmx16g -XX:MaxMetaspaceSize=1g -XX:+UseG1GC -XX:G1HeapRegionSize=16m -XX:+UseStringDeduplication -XX:+OptimizeStringConcat
 
-# Enable all performance optimizations for GitHub Actions
+# Enable performance optimizations but limit parallelism to prevent OOM
 org.gradle.parallel=true
 org.gradle.configureondemand=true
 org.gradle.caching=true
 org.gradle.daemon=true
-org.gradle.workers.max=12
-org.gradle.vfs.watch=true
+org.gradle.workers.max=6
+org.gradle.vfs.watch=false
 
 # CI-specific optimizations - enabled for GitHub Actions
 kotlin.incremental=true

scripts/build.sh

@@ -606,7 +606,16 @@ buildAndroidReleaseE2E(){
 	cp android/gradle.properties.github android/gradle.properties
 	# E2E builds only need x86_64 for emulator testing, reducing build time and memory usage
 	echo "Building E2E APKs for $flavor flavor..."
-	cd android && ./gradlew assemble${flavor}Release app:assemble${flavor}ReleaseAndroidTest -PminSdkVersion=26 -DtestBuildType=release
+	cd android
+	
+	# Try building with optimized settings
+	if ! ./gradlew assemble${flavor}Release app:assemble${flavor}ReleaseAndroidTest -PminSdkVersion=26 -DtestBuildType=release; then
+		echo "⚠️  Build failed, retrying with reduced parallelism..."
+		# Kill any remaining daemon
+		./gradlew --stop || true
+		# Retry with no parallel builds to reduce memory pressure
+		./gradlew assemble${flavor}Release app:assemble${flavor}ReleaseAndroidTest -PminSdkVersion=26 -DtestBuildType=release --no-parallel --max-workers=2
+	fi
 
 	# Verify APK files were created
 	echo ""
@@ -618,12 +627,16 @@ buildAndroidReleaseE2E(){
 		echo "✅ App APK found: $appApkPath ($(du -h "$appApkPath" | cut -f1))"
 	else
 		echo "❌ App APK NOT found at: $appApkPath"
+		cd ..
+		return 1
 	fi
 
 	if [ -f "$testApkPath" ]; then
 		echo "✅ Test APK found: $testApkPath ($(du -h "$testApkPath" | cut -f1))"
 	else
 		echo "❌ Test APK NOT found at: $testApkPath"
+		cd ..
+		return 1
 	fi
 	echo ""