Github flow improvements

mullvad · Dec 10, 2024 · da70d0f · da70d0f
1 parent 481361f
commit da70d0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml
@@ -132,14 +132,14 @@ jobs:
         env:
           RUSTFLAGS: --deny warnings
         run: |
-          mkdir -p android/app/build/extraAssets
-          cargo run --bin relay_list > android/app/build/extraAssets/relays.json
+          mkdir -p android/app/src/main/assets
+          cargo run --bin relay_list > android/app/src/main/assets/relays.json
 
       - name: Upload
         uses: actions/upload-artifact@v4
         with:
           name: relay-list
-          path: android/app/build/extraAssets/relays.json
+          path: android/app/src/main/assets/relays.json
           if-no-files-found: error
           retention-days: 7
 
@@ -197,7 +197,7 @@ jobs:
         env:
           cache_hash: ${{ steps.native-lib-cache-hash.outputs.native_lib_hash }}
         with:
-          path: ./android/app/build/extraJni
+          path: ./android/app/build/rustJniLibs
           key: android-native-libs-${{ runner.os }}-${{ matrix.abi }}-${{ env.cache_hash }}
 
       - name: Build native libraries
@@ -208,7 +208,7 @@ jobs:
         run: |
           ARCHITECTURES="${{ matrix.abi }}"
           UNSTRIPPED_LIB_PATH="$CARGO_TARGET_DIR/${{ matrix.target }}/$BUILD_TYPE/libmullvad_jni.so"
-          STRIPPED_LIB_PATH="./android/app/build/extraJni/${{ matrix.abi }}/libmullvad_jni.so"
+          STRIPPED_LIB_PATH="./android/app/build/rustJniLibs/${{ matrix.abi }}/libmullvad_jni.so"
           NDK_TOOLCHAIN_STRIP_TOOL="$NDK_TOOLCHAIN_DIR/llvm-strip"
           cargo build --target ${{ matrix.target }} --verbose --package mullvad-jni --features api-override
           $NDK_TOOLCHAIN_STRIP_TOOL --strip-debug --strip-unneeded -o "$STRIPPED_LIB_PATH" "$UNSTRIPPED_LIB_PATH"
@@ -217,7 +217,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: native-libs-${{ matrix.arch }}
-          path: android/app/build/extraJni
+          path: android/app/build/rustJniLibs
           if-no-files-found: error
           retention-days: 7
 
@@ -316,16 +316,16 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           pattern: native-libs-*
-          path: android/app/build/extraJni
+          path: android/app/build/rustJniLibs
           merge-multiple: true
 
       - uses: actions/download-artifact@v4
         with:
           name: relay-list
-          path: android/app/build/extraAssets
+          path: android/app/src/main/assets
 
       - name: Copy maybenot machines to asset directory
-        run: cp dist-assets/maybenot_machines android/app/build/extraAssets/
+        run: cp dist-assets/maybenot_machines android/app/src/main/assets/
 
       - name: Build app
         uses: burrunan/gradle-cache-action@v1

diff --git a/android/scripts/update-lockfile.sh b/android/scripts/update-lockfile.sh
@@ -21,6 +21,7 @@ GRADLE_TASKS=(
 )
 EXCLUDED_GRADLE_TASKS=(
     "-xgenerateRelayList"
+    "-xcargoBuild"
 )
 
 export GRADLE_OPTS