diff options
| author | Albin <albin@mullvad.net> | 2024-09-06 15:26:01 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-09-06 15:26:01 +0200 |
| commit | 17788c6ab46aef57eddc87f7eefd5a1f65a4683c (patch) | |
| tree | e5b0efdd66bdc77ee6b4ff16d3a23db854f5a213 /.github/workflows | |
| parent | b0b7db0926b7e78f1e320e2cf206c45989a02c93 (diff) | |
| parent | fca422d5f58e66ad8fc364b2ae3d393d3c9ec5e3 (diff) | |
| download | mullvadvpn-17788c6ab46aef57eddc87f7eefd5a1f65a4683c.tar.xz mullvadvpn-17788c6ab46aef57eddc87f7eefd5a1f65a4683c.zip | |
Merge branch 'add-android-daita-droid-1192'
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/android-app.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/clippy.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/rust-unused-dependencies.yml | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 436d53f93d..b098d346f7 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -175,6 +175,11 @@ jobs: with: submodules: true + - name: Checkout wireguard-go-rs recursively + run: | + git config --global --add safe.directory '*' + git submodule update --init --recursive --depth=1 wireguard-go-rs + - name: Calculate native lib cache hash id: native-lib-cache-hash shell: bash @@ -201,6 +206,8 @@ jobs: RUSTFLAGS: --deny warnings BUILD_TYPE: debug run: | + # Temporary fix to address maybenot.h build issues. + cargo install --force cbindgen --version "0.26.0" 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" @@ -319,6 +326,9 @@ jobs: name: relay-list path: android/app/build/extraAssets + - name: Copy maybenot machines to asset directory + run: cp dist-assets/maybenot_machines android/app/build/extraAssets/maybenot_machines + - name: Build app uses: burrunan/gradle-cache-action@v1 with: diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml index 55de677753..d847602fb6 100644 --- a/.github/workflows/clippy.yml +++ b/.github/workflows/clippy.yml @@ -97,7 +97,7 @@ jobs: - name: Checkout wireguard-go submodule run: | git config --global --add safe.directory '*' - git submodule update --init --depth=1 wireguard-go-rs + git submodule update --init --recursive --depth=1 wireguard-go-rs - name: Clippy check env: diff --git a/.github/workflows/rust-unused-dependencies.yml b/.github/workflows/rust-unused-dependencies.yml index 3122ce5d03..cfdd75e751 100644 --- a/.github/workflows/rust-unused-dependencies.yml +++ b/.github/workflows/rust-unused-dependencies.yml @@ -79,7 +79,7 @@ jobs: - name: Checkout wireguard-go submodule run: | git config --global --add safe.directory '*' - git submodule update --init --depth=1 wireguard-go-rs + git submodule update --init --recursive --depth=1 wireguard-go-rs - name: Install nightly Rust toolchain run: | |