Update ci flow

mullvad · Dec 17, 2024 · dddc802 · dddc802
1 parent 6786224
commit dddc802
Showing 1 changed file with 33 additions and 23 deletions.
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
@@ -129,11 +129,16 @@ jobs:
 
       - name: Generate
         if: steps.cache-relay-list.outputs.cache-hit != 'true'
-        env:
-          RUSTFLAGS: --deny warnings
-        run: |
-          mkdir -p android/app/build/extraAssets
-          cargo run --bin relay_list > android/app/build/extraAssets/relays.json
+        uses: burrunan/gradle-cache-action@v1
+        with:
+          job-id: jdk17
+          arguments: generateRelayList
+          gradle-version: wrapper
+          build-root-directory: android
+          execution-only-caches: false
+          # Disable if logs are hard to follow.
+          concurrent: true
+          read-only: ${{ github.ref != 'refs/heads/main' }}
 
       - name: Upload
         uses: actions/upload-artifact@v4
@@ -152,22 +157,15 @@ jobs:
     strategy:
       matrix:
         include:
-          - arch: "x86_64"
-            abi: "x86_64"
-            target: "x86_64-linux-android"
-            task: "cargoBuildX86_64"
-          - arch: "i686"
-            abi: "x86"
-            target: "i686-linux-android"
-            task: "cargoBuildX86"
-          - arch: "aarch64"
-            abi: "arm64-v8a"
-            target: "aarch64-linux-android"
-            task: "cargoBuildArm64"
-          - arch: "armv7"
-            abi: "armeabi-v7a"
-            target: "armv7-linux-androideabi"
-            task: "cargoBuildArm"
+          - abi: "x86_64"
+            taskVariant: "X86_64"
+          - abi: "x86"
+            taskVariant: "X86"
+          - abi: "arm64-v8a"
+            taskVariant: "Arm64"
+          - abi: "armeabi-v7a"
+            taskVariant: "Arm"
+    id: build-native-${{ matrix.abi }}        
     steps:
       # Fix for HOME path overridden by GH runners when building in containers, see:
       # https://github.com/actions/runner/issues/863
@@ -209,7 +207,7 @@ jobs:
         uses: burrunan/gradle-cache-action@v1
         with:
           job-id: jdk17
-          arguments: ${{ matrix.task }}
+          arguments: cargoBuild${{ matrix.taskVariant }}
           gradle-version: wrapper
           build-root-directory: android
           execution-only-caches: false
@@ -312,7 +310,19 @@ jobs:
             [
               {
                 "workflowFile": "android-app.yml",
-                "jobName": "build-native"
+                "jobName": "build-native-x86_64"
+              },
+              {
+                "workflowFile": "android-app.yml",
+                "jobName": "build-native-x86"
+              },
+              {
+                "workflowFile": "android-app.yml",
+                "jobName": "build-native-arm64-v8a"
+              },
+              {
+                "workflowFile": "android-app.yml",
+                "jobName": "build-native-armeabi-v7a"
               },
               {
                 "workflowFile": "android-app.yml",