diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-10-30 20:03:05 +0100 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-10-30 20:03:05 +0100 |
| commit | f73d69de09f6080e30099e1f7eb68451b4e93317 (patch) | |
| tree | d52b2e0d2eb160133f1bdb4adcd6352060ed787c /.github | |
| parent | 6dd4dc87e1f49abbad35b83cfe9db9d89b04ccde (diff) | |
| parent | 37e7be1c39e31644eb63b34402927f9fc66a2f93 (diff) | |
| download | mullvadvpn-f73d69de09f6080e30099e1f7eb68451b4e93317.tar.xz mullvadvpn-f73d69de09f6080e30099e1f7eb68451b4e93317.zip | |
Merge branch 'readd-maybenot-machines-v1'
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/android-app.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/android-audit.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/android-app.yml b/.github/workflows/android-app.yml index ebdade4556..3fc2bbb30e 100644 --- a/.github/workflows/android-app.yml +++ b/.github/workflows/android-app.yml @@ -325,7 +325,7 @@ jobs: path: android/app/build/extraAssets - name: Copy maybenot machines to asset directory - run: cp dist-assets/maybenot_machines android/app/build/extraAssets/maybenot_machines + run: cp dist-assets/maybenot_machines_v2 android/app/build/extraAssets/ - name: Build app uses: burrunan/gradle-cache-action@v1 diff --git a/.github/workflows/android-audit.yml b/.github/workflows/android-audit.yml index 5225675887..54bc503017 100644 --- a/.github/workflows/android-audit.yml +++ b/.github/workflows/android-audit.yml @@ -87,7 +87,7 @@ jobs: - name: Copy maybenot machines to asset directory run: | mkdir -p android/app/build/extraAssets - cp dist-assets/maybenot_machines android/app/build/extraAssets/maybenot_machines + cp dist-assets/maybenot_machines_v2 android/app/build/extraAssets/ - name: Re-generate lockfile run: android/scripts/update-lockfile.sh |