Skip to content

Commit 2a98b50

Browse files
jameshnsearsjameshnsears
committed
monster merge
1 parent 19b97d9 commit 2a98b50

File tree

170 files changed

+2044
-2931
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

170 files changed

+2044
-2931
lines changed

‎.github/actions/cache-avd/action.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Setup AVD Environment
2+
description: Setup Android Emulator cache
3+
4+
inputs:
5+
api-level:
6+
description: 'Android API level for the emulator'
7+
default: '36'
8+
9+
runs:
10+
using: composite
11+
steps:
12+
- name: AVD Cache
13+
uses: actions/cache@v4
14+
id: avd-cache
15+
with:
16+
path: |
17+
~/.android/avd/*
18+
~/.android/adb*
19+
key: avd-${{ inputs.api-level }}
20+
21+
- name: Create AVD and Generate Snapshot
22+
if: steps.avd-cache.outputs.cache-hit != 'true'
23+
uses: reactivecircus/android-emulator-runner@v2
24+
with:
25+
api-level: ${{ inputs.api-level }}
26+
avd-name: ${{ inputs.api-level }}
27+
arch: x86_64
28+
force-avd-creation: false
29+
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
30+
disable-animations: true
31+
script: echo "Generated AVD snapshot for caching."

‎.github/actions/cache-gradle/action.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Setup Gradle Environment
2+
description: Setup Java, custom Gradle cache
3+
4+
inputs:
5+
java-version:
6+
description: 'Java version to use'
7+
default: '21'
8+
distribution:
9+
description: 'Java distribution'
10+
default: 'zulu'
11+
12+
runs:
13+
using: composite
14+
steps:
15+
- name: Setup Java
16+
uses: actions/setup-java@v4
17+
with:
18+
java-version: ${{ inputs.java-version }}
19+
distribution: ${{ inputs.distribution }}
20+
21+
- name: Gradle Cache
22+
uses: actions/cache@v4
23+
with:
24+
path: |
25+
~/.gradle/caches
26+
~/.gradle/wrapper
27+
key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', '**/libs.versions.toml') }}
28+
restore-keys: |
29+
gradle-

‎.github/actions/get-avd-info/action.yml‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎.github/actions/setup-gradle/action.yml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎.github/workflows/codecov.app.androidTest.yml‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,21 @@ on:
44
push:
55
branches:
66
- "*"
7-
paths-ignore:
8-
- '**.md'
9-
- 'misc/**'
10-
- '.idea/**'
117

128
concurrency:
139
group: ${{ github.workflow }}-${{ github.ref }}
1410
cancel-in-progress: true
1511

1612
env:
17-
CACHE_VERSION: 1
13+
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
1814

1915
jobs:
2016
fdroid:
2117
name: fdroid
2218
runs-on: ubuntu-latest
2319
timeout-minutes: 30
2420
strategy:
25-
fail-fast: true
21+
fail-fast: false
2622
matrix:
2723
include:
2824
- api-level: 36
@@ -41,35 +37,8 @@ jobs:
4137
sudo udevadm control --reload-rules
4238
sudo udevadm trigger --name-match=kvm
4339
44-
- name: Setup gradle
45-
uses: ./.github/actions/setup-gradle
46-
47-
- name: Get AVD info
48-
uses: ./.github/actions/get-avd-info
49-
id: avd-info
50-
with:
51-
api-level: ${{ matrix.api-level }}
52-
53-
- uses: actions/cache@v4
54-
id: avd-cache
55-
with:
56-
path: |
57-
~/.android/avd/*
58-
~/.android/adb*
59-
key: ${{ runner.os }}-avd-${{ env.CACHE_VERSION }}-${{ steps.avd-info.outputs.arch }}-${{ steps.avd-info.outputs.target }}-${{ matrix.api-level }}
60-
61-
- name: Create AVD snapshot
62-
if: steps.avd-cache.outputs.cache-hit != 'true'
63-
uses: reactivecircus/android-emulator-runner@v2
64-
with:
65-
api-level: ${{ matrix.api-level }}
66-
arch: ${{ steps.avd-info.outputs.arch }}
67-
target: ${{ steps.avd-info.outputs.target }}
68-
disable-animations: true
69-
force-avd-creation: false
70-
ram-size: 2048M
71-
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
72-
script: echo "Generated AVD snapshot."
40+
- name: Restore cache gradle
41+
uses: ./.github/actions/cache-gradle
7342

7443
- name: local.properties
7544
env:
@@ -82,21 +51,26 @@ jobs:
8251
GOOGLE_PLAY_JSON_DEVELOPMENT: ${{ secrets.GOOGLE_PLAY_JSON_DEVELOPMENT }}
8352
run: echo "${GOOGLE_PLAY_JSON_DEVELOPMENT}" | base64 -d > app/google-services.json
8453

54+
- name: Restore cache avd
55+
uses: ./.github/actions/cache-avd
56+
with:
57+
api-level: ${{ matrix.api-level }}
58+
avd-name: ${{ matrix.api-level }}
59+
8560
- name: jacocoFdroidAndroidTestReport
8661
if: matrix.run-tests == true
8762
uses: reactivecircus/android-emulator-runner@v2
8863
with:
8964
api-level: ${{ matrix.api-level }}
90-
arch: ${{ steps.avd-info.outputs.arch }}
91-
target: ${{ steps.avd-info.outputs.target }}
65+
arch: x86_64
66+
avd-name: ${{ matrix.api-level }}
9267
disable-animations: true
9368
force-avd-creation: false
94-
ram-size: 2048M
9569
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
9670
script: |
9771
adb logcat -c
9872
adb logcat > logcat.txt &
99-
./gradlew :app:jacocoFdroidAndroidTestReport --stacktrace
73+
./gradlew :app:jacocoFdroidAndroidTestReport
10074
10175
- name: codecov
10276
if: matrix.run-tests == true

‎.github/workflows/codecov.data-common.androidTest.yml‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,21 @@ on:
44
push:
55
branches:
66
- "*"
7-
paths-ignore:
8-
- '**.md'
9-
- 'misc/**'
10-
- '.idea/**'
117

128
concurrency:
139
group: ${{ github.workflow }}-${{ github.ref }}
1410
cancel-in-progress: true
1511

1612
env:
17-
CACHE_VERSION: 1
13+
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
1814

1915
jobs:
2016
fdroid:
2117
name: fdroid
2218
runs-on: ubuntu-latest
2319
timeout-minutes: 30
2420
strategy:
25-
fail-fast: true
21+
fail-fast: false
2622
matrix:
2723
include:
2824
- api-level: 36
@@ -41,35 +37,8 @@ jobs:
4137
sudo udevadm control --reload-rules
4238
sudo udevadm trigger --name-match=kvm
4339
44-
- name: Setup gradle
45-
uses: ./.github/actions/setup-gradle
46-
47-
- name: Get AVD info
48-
uses: ./.github/actions/get-avd-info
49-
id: avd-info
50-
with:
51-
api-level: ${{ matrix.api-level }}
52-
53-
- uses: actions/cache@v4
54-
id: avd-cache
55-
with:
56-
path: |
57-
~/.android/avd/*
58-
~/.android/adb*
59-
key: ${{ runner.os }}-avd-${{ env.CACHE_VERSION }}-${{ steps.avd-info.outputs.arch }}-${{ steps.avd-info.outputs.target }}-${{ matrix.api-level }}
60-
61-
- name: Create AVD snapshot
62-
if: steps.avd-cache.outputs.cache-hit != 'true'
63-
uses: reactivecircus/android-emulator-runner@v2
64-
with:
65-
api-level: ${{ matrix.api-level }}
66-
arch: ${{ steps.avd-info.outputs.arch }}
67-
target: ${{ steps.avd-info.outputs.target }}
68-
disable-animations: true
69-
force-avd-creation: false
70-
ram-size: 2048M
71-
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
72-
script: echo "Generated AVD snapshot."
40+
- name: Restore cache gradle
41+
uses: ./.github/actions/cache-gradle
7342

7443
- name: local.properties
7544
env:
@@ -82,21 +51,26 @@ jobs:
8251
GOOGLE_PLAY_JSON_DEVELOPMENT: ${{ secrets.GOOGLE_PLAY_JSON_DEVELOPMENT }}
8352
run: echo "${GOOGLE_PLAY_JSON_DEVELOPMENT}" | base64 -d > app/google-services.json
8453

54+
- name: Restore cache avd
55+
uses: ./.github/actions/cache-avd
56+
with:
57+
api-level: ${{ matrix.api-level }}
58+
avd-name: ${{ matrix.api-level }}
59+
8560
- name: jacocoFdroidAndroidTestReport
8661
if: matrix.run-tests == true
8762
uses: reactivecircus/android-emulator-runner@v2
8863
with:
8964
api-level: ${{ matrix.api-level }}
90-
arch: ${{ steps.avd-info.outputs.arch }}
91-
target: ${{ steps.avd-info.outputs.target }}
65+
arch: x86_64
66+
avd-name: ${{ matrix.api-level }}
9267
disable-animations: true
9368
force-avd-creation: false
94-
ram-size: 2048M
9569
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
9670
script: |
9771
adb logcat -c
9872
adb logcat > logcat.txt &
99-
./gradlew :module:data-common:jacocoFdroidAndroidTestReport --stacktrace
73+
./gradlew :module:data-common:jacocoFdroidAndroidTestReport
10074
10175
- name: codecov
10276
if: matrix.run-tests == true

‎.github/workflows/codecov.ui.androidTest.yml‎

Lines changed: 13 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,21 @@ on:
44
push:
55
branches:
66
- "*"
7-
paths-ignore:
8-
- '**.md'
9-
- 'misc/**'
10-
- '.idea/**'
117

128
concurrency:
139
group: ${{ github.workflow }}-${{ github.ref }}
1410
cancel-in-progress: true
1511

1612
env:
17-
CACHE_VERSION: 1
13+
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
1814

1915
jobs:
2016
fdroid:
2117
name: fdroid
2218
runs-on: ubuntu-latest
2319
timeout-minutes: 30
2420
strategy:
25-
fail-fast: true
21+
fail-fast: false
2622
matrix:
2723
include:
2824
- api-level: 36
@@ -41,35 +37,8 @@ jobs:
4137
sudo udevadm control --reload-rules
4238
sudo udevadm trigger --name-match=kvm
4339
44-
- name: Setup gradle
45-
uses: ./.github/actions/setup-gradle
46-
47-
- name: Get AVD info
48-
uses: ./.github/actions/get-avd-info
49-
id: avd-info
50-
with:
51-
api-level: ${{ matrix.api-level }}
52-
53-
- uses: actions/cache@v4
54-
id: avd-cache
55-
with:
56-
path: |
57-
~/.android/avd/*
58-
~/.android/adb*
59-
key: ${{ runner.os }}-avd-${{ env.CACHE_VERSION }}-${{ steps.avd-info.outputs.arch }}-${{ steps.avd-info.outputs.target }}-${{ matrix.api-level }}
60-
61-
- name: Create AVD snapshot
62-
if: steps.avd-cache.outputs.cache-hit != 'true'
63-
uses: reactivecircus/android-emulator-runner@v2
64-
with:
65-
api-level: ${{ matrix.api-level }}
66-
arch: ${{ steps.avd-info.outputs.arch }}
67-
target: ${{ steps.avd-info.outputs.target }}
68-
disable-animations: true
69-
force-avd-creation: false
70-
ram-size: 2048M
71-
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
72-
script: echo "Generated AVD snapshot."
40+
- name: Restore cache gradle
41+
uses: ./.github/actions/cache-gradle
7342

7443
- name: local.properties
7544
env:
@@ -82,21 +51,26 @@ jobs:
8251
GOOGLE_PLAY_JSON_DEVELOPMENT: ${{ secrets.GOOGLE_PLAY_JSON_DEVELOPMENT }}
8352
run: echo "${GOOGLE_PLAY_JSON_DEVELOPMENT}" | base64 -d > app/google-services.json
8453

54+
- name: Restore cache avd
55+
uses: ./.github/actions/cache-avd
56+
with:
57+
api-level: ${{ matrix.api-level }}
58+
avd-name: ${{ matrix.api-level }}
59+
8560
- name: jacocoFdroidAndroidTestReport
8661
if: matrix.run-tests == true
8762
uses: reactivecircus/android-emulator-runner@v2
8863
with:
8964
api-level: ${{ matrix.api-level }}
90-
arch: ${{ steps.avd-info.outputs.arch }}
91-
target: ${{ steps.avd-info.outputs.target }}
65+
arch: x86_64
66+
avd-name: ${{ matrix.api-level }}
9267
disable-animations: true
9368
force-avd-creation: false
94-
ram-size: 2048M
9569
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
9670
script: |
9771
adb logcat -c
9872
adb logcat > logcat.txt &
99-
./gradlew :module:ui:jacocoFdroidAndroidTestReport --stacktrace
73+
./gradlew :module:ui:jacocoFdroidAndroidTestReport
10074
10175
- name: codecov
10276
if: matrix.run-tests == true

0 commit comments

Comments
 (0)