diff options
| author | David Lönnhager <david.l@mullvad.net> | 2022-09-09 17:43:36 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-09-29 16:35:23 +0200 |
| commit | 6ad53280614246ca8daba6db5d9157ec1c7d38a2 (patch) | |
| tree | 0c1d8b970b4e0a39fee7de62cff05af91d456f2f | |
| parent | 06f7d719b85d84f5231359f04867c5cee6d66029 (diff) | |
| download | mullvadvpn-6ad53280614246ca8daba6db5d9157ec1c7d38a2.tar.xz mullvadvpn-6ad53280614246ca8daba6db5d9157ec1c7d38a2.zip | |
Add arm64 Linux packages to build server scripts
| -rwxr-xr-x | ci/buildserver-build.sh | 7 | ||||
| -rwxr-xr-x | ci/buildserver-upload.sh | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 9790c85fa0..61b83a716b 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -121,6 +121,9 @@ build_ref() { -iname "*.pdb" | tar -cJf $PDB_DIR/pdb-$current_hash.tar.xz -T - ;; Linux*) + echo "Building ARM64 installers" + TARGETS=aarch64-unknown-linux-gnu ./build.sh "${BUILD_ARGS[@]}" || return 0 + echo "Building Android APK" ./build-apk.sh --app-bundle || return 0 ;; @@ -134,8 +137,8 @@ build_ref() { # Will only match paths that include *-dev-* which means release builds will not be included # Pipes all matching names and their new name to mv pushd dist - for original_file in MullvadVPN-*-dev-*{_amd64.deb,_x86_64.rpm,.exe,.pkg,.apk,.aab}; do - new_file=$(echo $original_file | sed -nE "s/^(MullvadVPN-.*-dev-.*)(_amd64\.deb|_x86_64\.rpm|\.exe|\.pkg|\.apk|\.aab)$/\1$version_suffix\2/p") + for original_file in MullvadVPN-*-dev-*{.deb,.rpm,.exe,.pkg,.apk,.aab}; do + new_file=$(echo $original_file | sed -nE "s/^(MullvadVPN-.*-dev-.*)(_amd64\.deb|_x86_64\.rpm|_arm64\.deb|_aarch64\.rpm|\.exe|\.pkg|\.apk|\.aab)$/\1$version_suffix\2/p") mv $original_file $new_file done popd diff --git a/ci/buildserver-upload.sh b/ci/buildserver-upload.sh index cf2a88a0d6..e6e50a4383 100755 --- a/ci/buildserver-upload.sh +++ b/ci/buildserver-upload.sh @@ -17,7 +17,7 @@ while true; do continue fi - version=$(echo "$f" | sed -Ee 's/MullvadVPN-(.*)(\.exe|\.pkg|_amd64\.deb|_x86_64\.rpm|\.apk|\.aab)/\1/g') + version=$(echo "$f" | sed -Ee 's/MullvadVPN-(.*)(\.exe|\.pkg|_amd64\.deb|_x86_64\.rpm|_arm64\.deb|_aarch64\.rpm|\.apk|\.aab)/\1/g') if [[ $version == *"-dev-"* ]]; then upload_path="builds" else |