diff options
| author | Albin <albin@mullvad.net> | 2023-11-20 08:44:39 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-11-20 08:44:39 +0100 |
| commit | dee94d62d8fb7f3dbbe64bd305597ee716968e44 (patch) | |
| tree | 7c50553f3efba067a9637209f49ee6761587c46b | |
| parent | 89420ba75603cb4fa5598fbd2ef780fc9bf52fe6 (diff) | |
| parent | ec57b19678d6d5299ca3705146bec818c8305c18 (diff) | |
| download | mullvadvpn-dee94d62d8fb7f3dbbe64bd305597ee716968e44.tar.xz mullvadvpn-dee94d62d8fb7f3dbbe64bd305597ee716968e44.zip | |
Merge branch 'publish-play-apk-droid-512'
| -rwxr-xr-x | build-apk.sh | 2 | ||||
| -rwxr-xr-x | ci/buildserver-upload.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build-apk.sh b/build-apk.sh index 9f53eac8f2..6add95e4a4 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -13,7 +13,7 @@ echo "" BUILD_TYPE="release" GRADLE_BUILD_TYPE="release" -GRADLE_TASKS=(createOssProdReleaseDistApk createPlayDevmoleReleaseDistApk createPlayStagemoleReleaseDistApk) +GRADLE_TASKS=(createOssProdReleaseDistApk createPlayProdReleaseDistApk createPlayDevmoleReleaseDistApk createPlayStagemoleReleaseDistApk) BUNDLE_TASKS=(createPlayProdReleaseDistBundle createPlayDevmoleReleaseDistBundle createPlayStagemoleReleaseDistBundle) CARGO_ARGS="--release" EXTRA_WGGO_ARGS="" diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index 2aee7e0845..906328262f 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -41,7 +41,7 @@ while true; do file_upload_dir="$upload_path/$version" if [[ $platform == "desktop" && ! $file == MullvadVPN-* ]]; then file_upload_dir="$file_upload_dir/additional-files" - elif [[ $platform == "android" && ! $file =~ MullvadVPN-"$version"(.apk|.play.aab) ]]; then + elif [[ $platform == "android" && ! $file =~ MullvadVPN-"$version"(.apk|.play.apk|.play.aab) ]]; then file_upload_dir="$file_upload_dir/additional-files" fi |