diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-12-09 09:05:53 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-12-10 14:34:21 +0100 |
| commit | ef09daaaeff4813b91af2de3d5e8b62de210cd22 (patch) | |
| tree | 23d52b07de691c0639eb72b57cadd5e2036493d5 | |
| parent | 997e8c4e80d2992d11ed5bfe20151c233e83cd01 (diff) | |
| download | mullvadvpn-ef09daaaeff4813b91af2de3d5e8b62de210cd22.tar.xz mullvadvpn-ef09daaaeff4813b91af2de3d5e8b62de210cd22.zip | |
Build universal installer in buildserver-build.sh
| -rwxr-xr-x | ci/buildserver-build.sh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 9e63db6a3b..b68bd79e77 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -196,6 +196,15 @@ function build_ref { if [[ "$(uname -s)" == "Darwin" ]]; then build_args+=(--universal --notarize) fi + if [[ "$(uname -s)" == "MINGW"* ]]; then + # Check if the windows-installer crate is present, and if so, build a universal installer. + # The check is needed for compatibility with older commits that don't have the crate/flag. + # It was added in December 2024. The condition can be removed when supporting commits + # older than that is no longer necessary. + if [[ -d "$BUILD_DIR/windows-installer" ]]; then + build_args+=(--universal) + fi + fi artifact_dir=$artifact_dir build "${build_args[@]}" || return 1 if [[ "$(uname -s)" == "Linux" ]]; then @@ -205,9 +214,6 @@ function build_ref { case "$(uname -s)" in MINGW*|MSYS_NT*) - echo "Building ARM64 installers" - target=aarch64-pc-windows-msvc artifact_dir=$artifact_dir build "${build_args[@]}" || return 1 - echo "Packaging all PDB files..." find ./windows/ \ ./target/release/mullvad-daemon.pdb \ @@ -226,7 +232,7 @@ function build_ref { # Pipes all matching names and their new name to mv pushd "$artifact_dir" for original_file in MullvadVPN-*-dev-*{.deb,.rpm,.exe,.pkg}; do - new_file=$(echo "$original_file" | perl -pe "s/^(MullvadVPN-.*?)(_arm64|_aarch64|_amd64|_x86_64)?(\.deb|\.rpm|\.exe|\.pkg)$/\1$version_suffix\2\3/p") + new_file=$(echo "$original_file" | perl -pe "s/^(MullvadVPN-.*?)(_x64|_arm64|_aarch64|_amd64|_x86_64)?(\.deb|\.rpm|\.exe|\.pkg)$/\1$version_suffix\2\3/p") mv "$original_file" "$new_file" done popd |