diff options
| author | Albin <albin@mullvad.net> | 2024-08-15 16:45:18 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-15 16:45:18 +0200 |
| commit | c48ea670e01399b2fb578816808c2d2bca66b4eb (patch) | |
| tree | 2b014f4606b2f5b181d18e245bbf461c0ff7f909 /.github/workflows | |
| parent | cb1df6aef6a3f09123f7ec15611188a245853e0d (diff) | |
| parent | faabc4e3ad1a7b77d7ed95da3e255c7d15582fac (diff) | |
| download | mullvadvpn-c48ea670e01399b2fb578816808c2d2bca66b4eb.tar.xz mullvadvpn-c48ea670e01399b2fb578816808c2d2bca66b4eb.zip | |
Merge branch 'refactor-lockfile-script-task-dependencies-droid-1254'
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/android-app.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/android-audit.yml | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index 48a8079369..22a9935ea3 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -114,7 +114,7 @@ jobs: uses: actions/cache@v4 id: cache-relay-list with: - path: build/relays.json + path: android/app/build/extraAssets/relays.json key: relay-list-${{ steps.get-date.outputs.date }} - name: Checkout repository @@ -128,14 +128,14 @@ jobs: env: RUSTFLAGS: --deny warnings run: | - mkdir -p build - cargo run --bin relay_list > build/relays.json + mkdir -p android/app/build/extraAssets + cargo run --bin relay_list > android/app/build/extraAssets/relays.json - name: Upload uses: actions/upload-artifact@v4 with: name: relay-list - path: build/relays.json + path: android/app/build/extraAssets/relays.json if-no-files-found: error retention-days: 7 @@ -313,7 +313,7 @@ jobs: - uses: actions/download-artifact@v4 with: name: relay-list - path: build + path: android/app/build/extraAssets/relays.json - name: Build app uses: burrunan/gradle-cache-action@v1 diff --git a/.github/workflows/android-audit.yml b/.github/workflows/android-audit.yml index e40111b469..c0a0ca8f78 100644 --- a/.github/workflows/android-audit.yml +++ b/.github/workflows/android-audit.yml @@ -81,10 +81,6 @@ jobs: - name: Fix git dir run: git config --global --add safe.directory $(pwd) - # Needed until we improve the build system. - - name: Create dummy jni dir - run: mkdir -p android/app/build/extraJni - - name: Re-generate lockfile run: android/scripts/update-lockfile.sh |