diff options
| author | Albin <albin@mullvad.net> | 2023-10-23 09:30:00 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-10-23 09:30:00 +0200 |
| commit | 90a275fd5e17888b6a36e568164bf5e5a5cc94b0 (patch) | |
| tree | d7514787de2fc57ab0eacbfc0b045942bc438b35 | |
| parent | a838b2ad9ef1cb6ac74eebb9ea8065923961ec87 (diff) | |
| parent | 070e7492aaca6138294f858786666961aa21d8e9 (diff) | |
| download | mullvadvpn-90a275fd5e17888b6a36e568164bf5e5a5cc94b0.tar.xz mullvadvpn-90a275fd5e17888b6a36e568164bf5e5a5cc94b0.zip | |
Merge branch 'build-stagemole-and-devmole-builds-in-build-script'
| -rwxr-xr-x | build-apk.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build-apk.sh b/build-apk.sh index 0056d208a1..fb1cb3d2cb 100755 --- a/build-apk.sh +++ b/build-apk.sh @@ -13,8 +13,8 @@ echo "" BUILD_TYPE="release" GRADLE_BUILD_TYPE="release" -GRADLE_TASK="createOssProdReleaseDistApk" -BUNDLE_TASK="createPlayProdReleaseDistBundle" +GRADLE_TASKS=(createOssProdReleaseDistApk createPlayDevmoleReleaseDistApk createPlayStagemoleReleaseDistApk) +BUNDLE_TASKS=(createPlayProdReleaseDistBundle createPlayDevmoleReleaseDistBundle createPlayStagemoleReleaseDistBundle) CARGO_ARGS="--release" EXTRA_WGGO_ARGS="" BUILD_BUNDLE="no" @@ -25,13 +25,13 @@ while [ ! -z "${1:-""}" ]; do if [[ "${1:-""}" == "--dev-build" ]]; then BUILD_TYPE="debug" GRADLE_BUILD_TYPE="debug" - GRADLE_TASK="createOssProdDebugDistApk" - BUNDLE_TASK="createOssProdDebugDistBundle" + GRADLE_TASKS=(createOssProdDebugDistApk) + BUNDLE_TASKS=(createOssProdDebugDistBundle) CARGO_ARGS="--features api-override" elif [[ "${1:-""}" == "--fdroid" ]]; then GRADLE_BUILD_TYPE="fdroid" - GRADLE_TASK="createOssProdFdroidDistApk" - BUNDLE_TASK="createOssProdFdroidDistBundle" + GRADLE_TASKS=(createOssProdFdroidDistApk) + BUNDLE_TASKS=(createOssProdFdroidDistBundle) EXTRA_WGGO_ARGS="--no-docker" elif [[ "${1:-""}" == "--app-bundle" ]]; then BUILD_BUNDLE="yes" @@ -116,10 +116,10 @@ echo "Updating relays.json..." cargo run --bin relay_list $CARGO_ARGS > build/relays.json cd "$SCRIPT_DIR/android" -$GRADLE_CMD --console plain "$GRADLE_TASK" +$GRADLE_CMD --console plain "${GRADLE_TASKS[@]}" if [[ "$BUILD_BUNDLE" == "yes" ]]; then - $GRADLE_CMD --console plain "$BUNDLE_TASK" + $GRADLE_CMD --console plain "${BUNDLE_TASKS[@]}" fi echo "**********************************" |