From 13aa36935677ebfd589f245feb35f01d84fc0375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20L=C3=B6nnhager?= Date: Mon, 9 Dec 2024 20:36:39 +0100 Subject: [PATCH] fixup: fix ci script feedback --- ci/buildserver-build.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index a2dd1bf26d2d..ba6fe47f1053 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -197,8 +197,11 @@ function build_ref { 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 + # This 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 universal build if supported build_args+=(--universal) fi fi @@ -211,11 +214,6 @@ function build_ref { case "$(uname -s)" in MINGW*|MSYS_NT*) - if [[ ! -d "$BUILD_DIR/windows-installer" ]]; then - echo "Building ARM64 installers" - target=aarch64-pc-windows-msvc artifact_dir=$artifact_dir build "${build_args[@]}" || return 1 - fi - echo "Packaging all PDB files..." find ./windows/ \ ./target/release/mullvad-daemon.pdb \