ci: fix release asset flattening and add emulator startup smoke test

Author: kexuejin

.github/workflows/build.yml

@@ -51,6 +51,54 @@ jobs:
           chmod +x verify.sh
           ./verify.sh
 
+  emulator-smoke:
+    name: Emulator Startup Smoke
+    runs-on: ubuntu-latest
+    needs: core-build
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
+      - name: Install Rust Toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: aarch64-linux-android,armv7-linux-androideabi,x86_64-linux-android
+
+      - name: Cache Rust artifacts
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: loader/app/src/main/rust
+
+      - name: Install cargo-ndk
+        run: cargo install cargo-ndk --locked
+
+      - name: Run connected startup smoke test
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 30
+          target: google_apis
+          arch: x86_64
+          profile: Nexus 6
+          disable-animations: true
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          script: |
+            if [ -z "${ANDROID_NDK_HOME:-}" ] && [ -d "${ANDROID_SDK_ROOT}/ndk" ]; then
+              export ANDROID_NDK_HOME="$(ls -d "${ANDROID_SDK_ROOT}/ndk/"* | sort -V | tail -n 1)"
+            fi
+            echo "Using ANDROID_NDK_HOME=${ANDROID_NDK_HOME:-unset}"
+            cd loader
+            ./gradlew -q dependencies || true
+            ./gradlew :app:connectedDebugAndroidTest --stacktrace
+
   gui-package:
     name: GUI Package (${{ matrix.platform.name }})
     runs-on: ${{ matrix.platform.os }}

.github/workflows/release.yml

@@ -148,12 +148,18 @@ jobs:
           set -euo pipefail
           TAG="${{ steps.vars.outputs.tag }}"
           mkdir -p release-assets
-          shopt -s nullglob
 
-          for file in release-artifacts/*; do
-            base="$(basename "$file")"
-            cp "$file" "release-assets/CrabShell-${TAG}-${base}"
-          done
+          # download-artifact can contain nested directories; publish files only.
+          while IFS= read -r -d '' file; do
+            rel="${file#release-artifacts/}"
+            safe_rel="${rel//\//-}"
+            cp "$file" "release-assets/CrabShell-${TAG}-${safe_rel}"
+          done < <(find release-artifacts -type f -print0 | sort -z)
+
+          if ! find release-assets -maxdepth 1 -type f | grep -q .; then
+            echo "No release files found under release-artifacts/"
+            exit 1
+          fi
 
           ls -lah release-assets
 

loader/app/build.gradle

@@ -78,7 +78,8 @@ tasks.register('cargoBuild', Exec) {
     }
 
     environment 'ANDROID_NDK_HOME', ndkHome
-    commandLine 'cargo', 'ndk', '-t', 'arm64-v8a', '-t', 'armeabi-v7a', '-o', '../jniLibs', 'build', '--release'
+    // Keep x86_64 for emulator/CI startup smoke tests.
+    commandLine 'cargo', 'ndk', '-t', 'arm64-v8a', '-t', 'armeabi-v7a', '-t', 'x86_64', '-o', '../jniLibs', 'build', '--release'
     workingDir 'src/main/rust'
 
     // Keep Android build honest: Rust/NDK failure should fail the build.

loader/app/src/androidTest/java/com/kapp/shell/ShellStartupSmokeTest.java

@@ -0,0 +1,26 @@
+package com.kapp.shell;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ShellStartupSmokeTest {
+    @Test
+    public void appContextIsAccessible() {
+        Context appContext = ApplicationProvider.getApplicationContext();
+        assertEquals("com.kapp.shell", appContext.getPackageName());
+    }
+
+    @Test
+    public void ensureDexLoadedDoesNotThrow() {
+        Context appContext = ApplicationProvider.getApplicationContext();
+        ShellApplication.ensureDexLoaded(appContext);
+    }
+}

verify.sh

@@ -153,7 +153,7 @@ if [ -z "$ANDROID_NDK_HOME" ]; then
     exit 1
 fi
 
-cargo ndk -t arm64-v8a -t armeabi-v7a -o ../jniLibs build --release
+cargo ndk -t arm64-v8a -t armeabi-v7a -t x86_64 -o ../jniLibs build --release
 if [ $? -ne 0 ]; then
     echo -e "${RED}[FAIL] Cargo NDK build failed.${NC}"
     exit 1