Add IMAP folder navigation drawer + per-API E2E CI matrix
Folder view: a left navigation drawer lists each account's IMAP folders; tapping one browses and caches that folder's mail. IMAP UIDs are unique only within a folder, so message identity, the fetch/read/flag/delete paths, sync, and the Room cache all became folder-aware (id = "accountId:folder:uid"; new `folder` column; schema v7->v8). Standard folders (Inbox/Sent/Drafts/Spam/Trash/ Archive) surface with friendly names + icons via RFC 6154 SPECIAL-USE attributes with a case-insensitive name fallback; the multi-account drawer adds an account switcher and a unified "All Inboxes". INBOX stays the only auto-synced, IDLE-watched, notifying folder; other folders sync on demand. Lower minSdk 33 -> 29 for a rolling ~7-year Android support window; guard the API-33 POST_NOTIFICATIONS runtime request accordingly. Tests and CI: - Bump espresso-core 3.6.1 -> 3.7.0 so Compose UI tests run on API 37 (3.6.1's InputManagerEventInjectionStrategy reflects a removed hidden method). - New coverage across layers: FolderRoleTest, ImapClientTest folder cases, MailboxViewModelTest, MailRepositoryImplTest folder routing, a FolderDrawer Compose UI test, and LibreMailDatabaseTest folder DAO/reconcile tests. - Gradle Managed Devices + a CI E2E matrix over every API 29-36; a single "CI passed" gate job fans in all jobs and is required by branch protection. - Non-blocking, custom-provisioned API 37 (preview) E2E job with image caching. - Build + unit-test jobs run on arm64 (ubuntu-24.04-arm); emulators stay x86_64. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 4.8
+111
-11
@@ -22,7 +22,9 @@ env:
|
||||
jobs:
|
||||
debug-build:
|
||||
name: Debug build
|
||||
runs-on: ubuntu-latest
|
||||
# arm64 Linux runner so the build toolchain matches real (arm64) Android devices. Emulator jobs
|
||||
# stay on x86_64 (below) because arm64 emulators need macOS hosts and Linux/KVM is more reliable.
|
||||
runs-on: ubuntu-24.04-arm
|
||||
steps:
|
||||
- name: Check out source
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
@@ -54,7 +56,7 @@ jobs:
|
||||
|
||||
unit-tests:
|
||||
name: Unit tests
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-24.04-arm
|
||||
steps:
|
||||
- name: Check out source
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
@@ -85,16 +87,21 @@ jobs:
|
||||
path: app/build/reports/tests/testDebugUnitTest/
|
||||
if-no-files-found: warn
|
||||
|
||||
instrumented-tests:
|
||||
name: Instrumented / UI tests (emulator)
|
||||
e2e:
|
||||
name: E2E
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
# minSdk is 33; the instrumented suite (SQLCipher, Keystore, Room, Compose UI,
|
||||
# mail providers) needs no API-37-specific behavior, so it runs on a stable,
|
||||
# widely-available emulator image rather than the bleeding-edge android-37.0.
|
||||
api-level: [35]
|
||||
# Every Android API level across the rolling ~7-year support window: minSdk (29 / Android 10,
|
||||
# 2019) through the latest stable. Each level boots its own emulator and runs the full
|
||||
# instrumented + Compose UI (E2E) suite; all of them fan in to the "CI passed" gate. When a
|
||||
# new Android ships, add it and drop the oldest level that has aged out of ~7 years. API 37
|
||||
# (preview) is NOT in this matrix because emulator-runner can't provision its nonstandard
|
||||
# android-37.0 / google_apis_ps16k image (it would wedge the gate) — it's covered separately
|
||||
# by the custom-provisioned, non-blocking `e2e-preview` job below. Keep in sync with
|
||||
# testOptions.managedDevices in app/build.gradle.kts.
|
||||
api-level: [29, 30, 31, 32, 33, 34, 35, 36]
|
||||
steps:
|
||||
- name: Check out source
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
@@ -144,7 +151,7 @@ jobs:
|
||||
disable-animations: false
|
||||
script: echo "Generated AVD snapshot for caching."
|
||||
|
||||
- name: Run instrumented tests
|
||||
- name: Run E2E tests
|
||||
uses: reactivecircus/android-emulator-runner@e89f39f1abbbd05b1113a29cf4db69e7540cae5a # v2.37.0
|
||||
with:
|
||||
api-level: ${{ matrix.api-level }}
|
||||
@@ -155,10 +162,103 @@ jobs:
|
||||
disable-animations: true
|
||||
script: ./gradlew connectedDebugAndroidTest --stacktrace
|
||||
|
||||
- name: Upload instrumented test report
|
||||
- name: Upload E2E test report
|
||||
if: ${{ !cancelled() }}
|
||||
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
||||
with:
|
||||
name: instrumented-test-report-api${{ matrix.api-level }}
|
||||
name: e2e-test-report-api${{ matrix.api-level }}
|
||||
path: app/build/reports/androidTests/connected/
|
||||
if-no-files-found: warn
|
||||
|
||||
# API 37 (Android 17, preview) E2E. Its only system image is the nonstandard
|
||||
# android-37.0 / google_apis_ps16k (16 KB page size), which reactivecircus/android-emulator-runner
|
||||
# can't provision (it builds android-37 / google_apis, neither of which exists), so this job
|
||||
# CUSTOM-PROVISIONS the emulator with sdkmanager/avdmanager/emulator directly. Deliberately
|
||||
# NON-BLOCKING: it is NOT in the "CI passed" gate's needs and not a required status check, so a
|
||||
# flaky preview can never block merges — it's signal only. When a stable, emulator-runner-friendly
|
||||
# API 37 image ships, fold 37 into the main `e2e` matrix and delete this job.
|
||||
e2e-preview:
|
||||
name: E2E (API 37 preview, non-blocking)
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 35
|
||||
env:
|
||||
API37_IMAGE: "system-images;android-37.0;google_apis_ps16k;x86_64"
|
||||
steps:
|
||||
- name: Check out source
|
||||
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
|
||||
|
||||
- name: Set up JDK 21
|
||||
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: "21"
|
||||
|
||||
- name: Set up Android SDK
|
||||
uses: android-actions/setup-android@40fd30fb8d7440372e1316f5d1809ec01dcd3699 # v4.0.1
|
||||
|
||||
- name: Set up Gradle
|
||||
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
|
||||
|
||||
# The hardware-accelerated emulator needs KVM, which is gated behind a udev rule.
|
||||
- name: Enable KVM
|
||||
run: |
|
||||
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
|
||||
sudo udevadm control --reload-rules
|
||||
sudo udevadm trigger --name-match=kvm
|
||||
|
||||
# Cache the ~1 GB preview system image so only the first run pays the download.
|
||||
- name: Cache API 37 system image
|
||||
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
|
||||
with:
|
||||
# GitHub-hosted ubuntu runners install the SDK at /usr/local/lib/android/sdk; caching the
|
||||
# image dir (with its package metadata) lets sdkmanager treat it as installed and skip the
|
||||
# re-download on a cache hit.
|
||||
path: /usr/local/lib/android/sdk/system-images/android-37.0
|
||||
key: sysimg-android-37.0-google_apis_ps16k-x86_64
|
||||
|
||||
- name: Install SDK packages + preview system image
|
||||
run: sdkmanager "$ANDROID_PLATFORM" "$ANDROID_BUILD_TOOLS" "platform-tools" "emulator" "$API37_IMAGE"
|
||||
|
||||
- name: Create API 37 AVD
|
||||
run: echo "no" | avdmanager create avd -n api37 -k "$API37_IMAGE" -d pixel_2 --force
|
||||
|
||||
- name: Boot emulator and run E2E
|
||||
run: |
|
||||
set -euo pipefail
|
||||
"$ANDROID_SDK_ROOT/emulator/emulator" -avd api37 \
|
||||
-no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -no-snapshot -camera-back none &
|
||||
adb wait-for-device
|
||||
timeout 300 bash -c 'while [ "$(adb shell getprop sys.boot_completed | tr -d "\r")" != "1" ]; do sleep 3; done'
|
||||
adb shell input keyevent 82 || true
|
||||
./gradlew connectedDebugAndroidTest --stacktrace
|
||||
|
||||
- name: Shut down emulator
|
||||
if: always()
|
||||
run: adb emu kill || true
|
||||
|
||||
- name: Upload E2E (API 37) report
|
||||
if: ${{ !cancelled() }}
|
||||
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
||||
with:
|
||||
name: e2e-test-report-api37-preview
|
||||
path: app/build/reports/androidTests/connected/
|
||||
if-no-files-found: warn
|
||||
|
||||
# Single aggregating gate so branch protection can require ALL CI jobs with one stable status
|
||||
# check. It depends on every job — including each api-level of the E2E matrix — so adding/removing
|
||||
# a matrix level needs no change to branch protection (the per-"(api-level)" check names would
|
||||
# otherwise have to be re-listed each time).
|
||||
ci-passed:
|
||||
name: CI passed
|
||||
if: always()
|
||||
needs: [debug-build, unit-tests, e2e]
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Verify every required job succeeded
|
||||
if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
|
||||
run: |
|
||||
echo "Required CI jobs did not all succeed:"
|
||||
echo " debug-build: ${{ needs.debug-build.result }}"
|
||||
echo " unit-tests: ${{ needs.unit-tests.result }}"
|
||||
echo " e2e: ${{ needs.e2e.result }}"
|
||||
exit 1
|
||||
|
||||
Reference in New Issue
Block a user