ci: debug APK location — copy all build outputs to dist/, upload dir

Author: leoisadev1

.github/workflows/build-android.yml

@@ -60,55 +60,79 @@ jobs:
           [ -n "$GRADLEW" ] || { echo "::error::No gradlew found after prebuild"; exit 1; }
           chmod +x "$GRADLEW"
           ANDROID_DIR=$(dirname "$GRADLEW")
-          echo "gradlew=$GRADLEW"         >> $GITHUB_OUTPUT
           echo "android_dir=$ANDROID_DIR" >> $GITHUB_OUTPUT
-          echo "Found android dir: $ANDROID_DIR"
+          echo "gradlew_abs=$(realpath $GRADLEW)" >> $GITHUB_OUTPUT
+          echo "Found gradlew at: $(realpath $GRADLEW)"
+          echo "Android dir: $ANDROID_DIR"
 
       - name: Cache Gradle
         uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/wrapper
             ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}-v4
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/gradle-wrapper.properties') }}-v5
           restore-keys: ${{ runner.os }}-gradle-
 
       - name: Build debug APK
         working-directory: ${{ steps.find-android.outputs.android_dir }}
         run: |
+          echo "=== PWD: $(pwd) ==="
+          echo "=== gradlew: $(realpath ./gradlew) ==="
           ./gradlew assembleDebug \
             --no-daemon \
             --no-build-cache \
             --stacktrace \
             2>&1 | tee /tmp/gradle.log
-          tail -30 /tmp/gradle.log
+          GRADLE_RC=${PIPESTATUS[0]}
+          tail -40 /tmp/gradle.log
+          exit $GRADLE_RC
 
-      # Find ALL .apk files produced anywhere in the workspace and show them
-      - name: Inventory APK files
+      # Collect everything Gradle produced and copy to a flat dist/ folder
+      - name: Collect build outputs
         if: always()
         run: |
-          echo "=== All .apk files in workspace ==="
+          echo "=== All files under android_dir build outputs ==="
+          ADIR="${{ steps.find-android.outputs.android_dir }}"
+          find "$ADIR" -path "*/build/outputs*" -not -path "*/node_modules/*" 2>/dev/null \
+            | head -60 | tee /tmp/build-outputs.txt
+
+          echo ""
+          echo "=== APK files specifically ==="
           find . -name "*.apk" -not -path "*/node_modules/*" 2>/dev/null \
-            | xargs -I{} sh -c 'echo "{}: $(du -h {} | cut -f1)"' || echo "(none found)"
+            | tee /tmp/apk-list.txt
+
+          echo ""
+          echo "=== Copying APKs to dist/ ==="
+          mkdir -p dist
+          while IFS= read -r apk; do
+            dest="dist/$(basename $apk)"
+            cp "$apk" "$dest"
+            echo "Copied: $apk -> $dest ($(du -h $dest | cut -f1))"
+          done < /tmp/apk-list.txt
+
+          echo ""
+          echo "=== dist/ contents ==="
+          ls -lh dist/ 2>/dev/null || echo "(empty)"
 
       - name: Upload Gradle log
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: gradle-log-run${{ github.run_number }}
-          path: /tmp/gradle.log
+          path: |
+            /tmp/gradle.log
+            /tmp/apk-list.txt
+            /tmp/build-outputs.txt
           if-no-files-found: ignore
           retention-days: 7
 
-      # Use a glob pattern across the entire workspace to catch the APK
-      # regardless of what path expo prebuild generated it under
-      - name: Upload all APKs (glob)
+      # Upload the entire dist/ directory (will contain the APK if build succeeded)
+      - name: Upload APK
         uses: actions/upload-artifact@v4
         with:
-          name: openchat-android-debug-${{ github.run_number }}
-          path: |
-            **/outputs/apk/**/*.apk
-            **/build/outputs/**/*.apk
+          name: openchat-android-debug-run${{ github.run_number }}
+          path: dist/
           if-no-files-found: error
           retention-days: 30
 
@@ -117,12 +141,8 @@ jobs:
         run: |
           echo "### ✅ Android Debug APK" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Artifact:** \`openchat-android-debug-${{ github.run_number }}\`" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Download:** Actions run page → Artifacts section → click to download zip." >> $GITHUB_STEP_SUMMARY
+          echo "Artifact: \`openchat-android-debug-run${{ github.run_number }}\`" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "**Install on Pixel 9:**" >> $GITHUB_STEP_SUMMARY
-          echo "1. Transfer APK to device (USB or share link)" >> $GITHUB_STEP_SUMMARY
-          echo "2. Open Files app, tap the APK" >> $GITHUB_STEP_SUMMARY
-          echo "3. Allow 'Install unknown apps' when prompted" >> $GITHUB_STEP_SUMMARY
-          echo "4. Launch OpenChat, set Convex URL in settings" >> $GITHUB_STEP_SUMMARY
+          echo "Download from the Artifacts section of this run page." >> $GITHUB_STEP_SUMMARY
+          echo "Unzip and transfer the APK to your Pixel 9." >> $GITHUB_STEP_SUMMARY
+          echo "Enable Install unknown apps → tap the APK to install." >> $GITHUB_STEP_SUMMARY