@@ -129,11 +129,16 @@ jobs:
129
129
130
130
- name : Generate
131
131
if : steps.cache-relay-list.outputs.cache-hit != 'true'
132
- env :
133
- RUSTFLAGS : --deny warnings
134
- run : |
135
- mkdir -p android/app/build/extraAssets
136
- cargo run --bin relay_list > android/app/build/extraAssets/relays.json
132
+ uses : burrunan/gradle-cache-action@v1
133
+ with :
134
+ job-id : jdk17
135
+ arguments : generateRelayList
136
+ gradle-version : wrapper
137
+ build-root-directory : android
138
+ execution-only-caches : false
139
+ # Disable if logs are hard to follow.
140
+ concurrent : true
141
+ read-only : ${{ github.ref != 'refs/heads/main' }}
137
142
138
143
- name : Upload
139
144
uses : actions/upload-artifact@v4
@@ -152,22 +157,15 @@ jobs:
152
157
strategy :
153
158
matrix :
154
159
include :
155
- - arch : " x86_64"
156
- abi : " x86_64"
157
- target : " x86_64-linux-android"
158
- task : " cargoBuildX86_64"
159
- - arch : " i686"
160
- abi : " x86"
161
- target : " i686-linux-android"
162
- task : " cargoBuildX86"
163
- - arch : " aarch64"
164
- abi : " arm64-v8a"
165
- target : " aarch64-linux-android"
166
- task : " cargoBuildArm64"
167
- - arch : " armv7"
168
- abi : " armeabi-v7a"
169
- target : " armv7-linux-androideabi"
170
- task : " cargoBuildArm"
160
+ - abi : " x86_64"
161
+ taskVariant : " X86_64"
162
+ - abi : " x86"
163
+ taskVariant : " X86"
164
+ - abi : " arm64-v8a"
165
+ taskVariant : " Arm64"
166
+ - abi : " armeabi-v7a"
167
+ taskVariant : " Arm"
168
+ id : build-native-${{ matrix.abi }}
171
169
steps :
172
170
# Fix for HOME path overridden by GH runners when building in containers, see:
173
171
# https://github.com/actions/runner/issues/863
@@ -209,7 +207,7 @@ jobs:
209
207
uses : burrunan/gradle-cache-action@v1
210
208
with :
211
209
job-id : jdk17
212
- arguments : ${{ matrix.task }}
210
+ arguments : cargoBuild ${{ matrix.taskVariant }}
213
211
gradle-version : wrapper
214
212
build-root-directory : android
215
213
execution-only-caches : false
@@ -312,7 +310,19 @@ jobs:
312
310
[
313
311
{
314
312
"workflowFile": "android-app.yml",
315
- "jobName": "build-native"
313
+ "jobName": "build-native-x86_64"
314
+ },
315
+ {
316
+ "workflowFile": "android-app.yml",
317
+ "jobName": "build-native-x86"
318
+ },
319
+ {
320
+ "workflowFile": "android-app.yml",
321
+ "jobName": "build-native-arm64-v8a"
322
+ },
323
+ {
324
+ "workflowFile": "android-app.yml",
325
+ "jobName": "build-native-armeabi-v7a"
316
326
},
317
327
{
318
328
"workflowFile": "android-app.yml",
0 commit comments