Skip to content

Commit c00d920

Browse files
committed
build: no isolated android build, gradle don’t like it
1 parent d078f67 commit c00d920

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/cd.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ jobs:
9494
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=
9595
- uses: DeterminateSystems/magic-nix-cache-action@v13
9696
- name: Build Android
97-
run: nix build .#android -o android-dist
97+
run: |
98+
nix develop -c dx build --android --release --target aarch64-linux-android
99+
nix develop -c ./scripts/android-icon.sh
98100
- name: Sign APK
99101
env:
100102
ANDROID_KEYSTORE_PASS: ${{ secrets.ANDROID_KEYSTORE_PASS }}
@@ -104,7 +106,8 @@ jobs:
104106
run: |
105107
mkdir -p android/secrets
106108
echo "$ANDROID_KEYSTORE_BASE64" | base64 -d > android/secrets/logout.jks
107-
APK_SRC=$(find android-dist -name "*.apk" | head -n 1)
109+
# Find the built APK in the target directory
110+
APK_SRC=$(find target/dx/log-out/release/android/ -name "*.apk" | head -n 1)
108111
cp "$APK_SRC" logout.apk
109112
nix develop -c ./scripts/android-sign.sh logout.apk
110113

.github/workflows/nightly.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ jobs:
7474
extra-substituters = https://cache.garnix.io
7575
extra-trusted-public-keys = cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=
7676
- uses: DeterminateSystems/magic-nix-cache-action@v13
77-
7877
- name: Build Android APK
79-
run: nix build .#android -o android-dist
80-
78+
run: |
79+
nix develop -c dx build --android --release --target aarch64-linux-android
80+
nix develop -c ./scripts/android-icon.sh
8181
- name: Run Android E2E
8282
uses: reactivecircus/android-emulator-runner@v2
8383
with:
@@ -88,7 +88,7 @@ jobs:
8888
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
8989
disable-animations: false
9090
script: |
91-
APK=$(find android-dist -name "*.apk" | head -n 1)
91+
APK=$(find target/dx/log-out/release/android/ -name "*.apk" | head -n 1)
9292
adb install "$APK"
9393
nix develop -c maestro test maestro/android/launch.yaml
9494

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ checks that run every night at 2:00 AM (UTC) on the `main` branch.
206206

207207
## TODO
208208

209+
- Fix CI LightHouse and Maestro
210+
- Use a FOD for Gradle downloads to build Android app purely with Nix
209211
- DRY E2E tests to only one par user story, they can still runFlow others
210212
- Mock exercise database with public/exercises.json for E2E tests, so they can
211213
load faster and not rely on external network requests

0 commit comments

Comments
 (0)