Skip to content

Commit f1b1ad7

Browse files
committed
Merge branch 'develop'
2 parents e5f5b50 + caba098 commit f1b1ad7

File tree

1,674 files changed

+61157
-33271
lines changed

Some content is hidden

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

1,674 files changed

+61157
-33271
lines changed

.github/apply_signing.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
echo $SIGNING_KEY | base64 -d > key.jks
2-
echo $GOOGLE_SERVICES | base64 -d > app/google-services.json
2+
echo $GOOGLE_SERVICES | base64 -d > android/google-services.json
33
echo "storeFile=key.jks
44
storePassword=$KEY_STORE_PASSWORD
55
keyAlias=$ALIAS

.github/workflows/android.yml

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
name: Android CI
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- develop
8+
paths-ignore:
9+
- '**.md'
10+
pull_request:
11+
paths-ignore:
12+
- '**.md'
13+
14+
concurrency:
15+
group: android-${{ github.ref }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
build:
20+
runs-on: ubuntu-latest
21+
timeout-minutes: 30
22+
steps:
23+
- uses: actions/checkout@v2
24+
25+
- name: Set up JDK
26+
uses: actions/setup-java@v1
27+
with:
28+
java-version: 17
29+
30+
- name: Set up Android SDK License
31+
run: yes | /usr/local/lib/android/sdk/tools/bin/sdkmanager --licenses
32+
33+
- name: Build with Gradle
34+
run: ./gradlew :android:spotlessCheck :android:lint :android:build
35+
36+
- name: Upload build reports
37+
uses: actions/upload-artifact@v2
38+
with:
39+
name: build-reports
40+
path: '**/build/reports'
41+
42+
- name: Upload build mapping
43+
uses: actions/upload-artifact@v2
44+
with:
45+
name: build-mapping
46+
path: ./android/build/outputs/mapping
47+
48+
unit-test:
49+
runs-on: ubuntu-latest
50+
needs: build
51+
timeout-minutes: 30
52+
steps:
53+
- uses: actions/checkout@v2
54+
55+
- name: Set up JDK
56+
uses: actions/setup-java@v1
57+
with:
58+
java-version: 17
59+
60+
- name: Set up Android SDK License
61+
run: yes | /usr/local/lib/android/sdk/tools/bin/sdkmanager --licenses
62+
63+
- name: Build with Gradle
64+
run: ./gradlew :android:test
65+
66+
- name: Upload test results
67+
if: always()
68+
uses: actions/upload-artifact@v2
69+
with:
70+
name: unit-test-result
71+
path: "**/build/test-results/**/*.xml"
72+
73+
connected-test:
74+
runs-on: macOS-11
75+
needs: build
76+
timeout-minutes: 60
77+
78+
strategy:
79+
# Allow tests to continue on other devices if they fail on one device.
80+
fail-fast: false
81+
matrix:
82+
include:
83+
- api-level: 30
84+
target: google_apis
85+
- api-level: 28
86+
target: default
87+
- api-level: 26
88+
target: default
89+
- api-level: 24
90+
target: default
91+
- api-level: 22
92+
target: default
93+
94+
steps:
95+
- uses: actions/checkout@v2
96+
97+
- name: set up JDK
98+
uses: actions/setup-java@v1
99+
with:
100+
java-version: 17
101+
102+
- name: Set up Android SDK License
103+
run: (while sleep 3; do echo "y"; done) | /Users/runner/Library/Android/sdk/cmdline-tools/latest/bin/sdkmanager --licenses
104+
105+
- name: Build tests
106+
run: ./gradlew :android:assembleAndroidTest
107+
108+
- name: Run tests
109+
uses: reactivecircus/android-emulator-runner@v2
110+
timeout-minutes: 40
111+
with:
112+
api-level: ${{ matrix.api-level }}
113+
profile: 4in WVGA (Nexus S)
114+
ram-size: 2048M
115+
target: ${{ matrix.target }}
116+
script: |
117+
adb logcat > logcat.txt &
118+
./gradlew :android:connectedCheck
119+
120+
- name: Upload logs
121+
if: always()
122+
uses: actions/upload-artifact@v2
123+
with:
124+
name: logs-${{ matrix.api-level }}-${{ matrix.target }}
125+
path: logcat.txt
126+
127+
- name: Upload test results
128+
if: always()
129+
uses: actions/upload-artifact@v2
130+
with:
131+
name: test-results-${{ matrix.api-level }}-${{ matrix.target }}
132+
path: "**/build/outputs/**/connected/**/*.xml"

.github/workflows/build.yml

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

0 commit comments

Comments
 (0)