diff options
| author | Albin <albin@mullvad.net> | 2024-11-04 15:45:04 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-11-04 15:45:04 +0100 |
| commit | 777828f05510f077408e15affff5489caa0d132b (patch) | |
| tree | 11388812edc9f2f032dc58b870123bc98867b541 | |
| parent | 82e49f3dc29cc7d06edd2f23f7bfbe3c85ed349b (diff) | |
| parent | c7e053838a992bc7b5f371189007d35a8142b8e4 (diff) | |
| download | mullvadvpn-777828f05510f077408e15affff5489caa0d132b.tar.xz mullvadvpn-777828f05510f077408e15affff5489caa0d132b.zip | |
Merge branch 'exclude-maybenot-bundle-check-in-lockfile-script'
| -rw-r--r-- | .github/workflows/android-audit.yml | 5 | ||||
| -rwxr-xr-x | android/scripts/update-lockfile.sh | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/.github/workflows/android-audit.yml b/.github/workflows/android-audit.yml index 54bc503017..1f45285aee 100644 --- a/.github/workflows/android-audit.yml +++ b/.github/workflows/android-audit.yml @@ -84,11 +84,6 @@ jobs: - name: Fix git dir run: git config --global --add safe.directory $(pwd) - - name: Copy maybenot machines to asset directory - run: | - mkdir -p android/app/build/extraAssets - cp dist-assets/maybenot_machines_v2 android/app/build/extraAssets/ - - name: Re-generate lockfile run: android/scripts/update-lockfile.sh diff --git a/android/scripts/update-lockfile.sh b/android/scripts/update-lockfile.sh index e400caed72..e062fd08c3 100755 --- a/android/scripts/update-lockfile.sh +++ b/android/scripts/update-lockfile.sh @@ -22,6 +22,7 @@ GRADLE_TASKS=( EXCLUDED_GRADLE_TASKS=( "-xensureRelayListExist" "-xensureJniDirectoryExist" + "-xensureMaybenotMachinesExist" ) export GRADLE_OPTS |