diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2020-03-30 17:51:44 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2020-03-30 18:13:19 +0200 |
| commit | eae5cf9f4f8fd30db4fbe11c4c0bc91db791b25e (patch) | |
| tree | b2ee6c66d327a4be4f8686fdf61eb70955fca55f /ci | |
| parent | f1de80db3e4552e8c4386ba6d8d758ceb431ae12 (diff) | |
| download | mullvadvpn-eae5cf9f4f8fd30db4fbe11c4c0bc91db791b25e.tar.xz mullvadvpn-eae5cf9f4f8fd30db4fbe11c4c0bc91db791b25e.zip | |
Update buildserver scripts to include Android app bundle
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/buildserver-build.sh | 4 | ||||
| -rwxr-xr-x | ci/buildserver-upload.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index b6b2ad18a0..84d303a1ef 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -43,7 +43,7 @@ EOF } upload() { - for f in MullvadVPN-*.{deb,rpm,exe,pkg,apk}; do + for f in MullvadVPN-*.{deb,rpm,exe,pkg,apk,aab}; do sha256sum "$f" > "$f.sha256" case "$(uname -s)" in # Linux is both the build and upload server. Just move directly to target dir @@ -116,7 +116,7 @@ build_ref() { ;; Linux*) echo "Building Android APK" - ./build-apk.sh || return 0 + ./build-apk.sh --app-bundle || return 0 ;; esac diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index 970a529f9b..0511c8dc27 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -9,7 +9,7 @@ cd $UPLOAD_DIR while true; do sleep 10 - for f_checksum in MullvadVPN-*.{deb,rpm,exe,pkg,apk}.sha256; do + for f_checksum in MullvadVPN-*.{deb,rpm,exe,pkg,apk,aab}.sha256; do sleep 1 f="${f_checksum/.sha256/}" if ! sha256sum --quiet -c "$f_checksum"; then @@ -17,7 +17,7 @@ while true; do continue fi - version=$(echo $f | sed -Ee 's/MullvadVPN-(.*)(\.exe|\.pkg|_amd64\.deb|_x86_64\.rpm|.apk)/\1/g') + version=$(echo $f | sed -Ee 's/MullvadVPN-(.*)(\.exe|\.pkg|_amd64\.deb|_x86_64\.rpm|\.apk|\.aab)/\1/g') ssh build.mullvad.net mkdir -p "app/$version" || continue scp -pB "$f" build.mullvad.net:app/$version/ || continue |