diff options
| author | Oskar <oskar@mullvad.net> | 2024-09-30 10:28:05 +0200 |
|---|---|---|
| committer | Oskar <oskar@mullvad.net> | 2024-10-02 11:58:09 +0200 |
| commit | 9baf79722129f8d1594331c780bf38f76fa43398 (patch) | |
| tree | 1dac5422de9d3bbc22dc959b68a77eaffd9aa910 | |
| parent | d34c403ff3290761932c63be21632f024daffcaf (diff) | |
| download | mullvadvpn-9baf79722129f8d1594331c780bf38f76fa43398.tar.xz mullvadvpn-9baf79722129f8d1594331c780bf38f76fa43398.zip | |
Remove architecture suffix on Windows x64 installer
| -rwxr-xr-x | ci/buildserver-build.sh | 2 | ||||
| -rw-r--r-- | gui/tasks/distribution.js | 9 | ||||
| -rwxr-xr-x | test/scripts/test-utils.sh | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/ci/buildserver-build.sh b/ci/buildserver-build.sh index 584e0dd2ba..055e3ad5be 100755 --- a/ci/buildserver-build.sh +++ b/ci/buildserver-build.sh @@ -225,7 +225,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" | sed -nE "s/^(MullvadVPN-.*-dev-.*)(_amd64\.deb|_x86_64\.rpm|_arm64\.deb|_aarch64\.rpm|_x64\.exe|_arm64\.exe|\.pkg)$/\1$version_suffix\2/p") + new_file=$(echo "$original_file" | perl -pe "s/^(MullvadVPN-.*?)(_arm64|_aarch64|_amd64|_x86_64)?(\.deb|\.rpm|\.exe|\.pkg)$/\1$version_suffix\2\3/p") mv "$original_file" "$new_file" done popd diff --git a/gui/tasks/distribution.js b/gui/tasks/distribution.js index 0e80c3c73f..50e4e0ad94 100644 --- a/gui/tasks/distribution.js +++ b/gui/tasks/distribution.js @@ -135,7 +135,7 @@ const config = { arch: getWindowsTargetArch(), }, ], - artifactName: 'MullvadVPN-${version}_${arch}.${ext}', + artifactName: getWindowsArtifactName(), publisherName: 'Mullvad VPN AB', extraResources: [ { from: distAssets(path.join(getWindowsDistSubdir(), 'mullvad.exe')), to: '.' }, @@ -464,6 +464,13 @@ function getWindowsTargetArch() { return 'x64'; } +function getWindowsArtifactName() { + if (targets === 'aarch64-pc-windows-msvc') { + return 'MullvadVPN-${version}_${arch}.${ext}'; + } + return 'MullvadVPN-${version}.${ext}'; +} + function getWindowsTargetSubdir() { if (targets && process.platform === 'win32') { if (targets === 'aarch64-pc-windows-msvc') { diff --git a/test/scripts/test-utils.sh b/test/scripts/test-utils.sh index 6ee2ebed52..aab23f7867 100755 --- a/test/scripts/test-utils.sh +++ b/test/scripts/test-utils.sh @@ -122,7 +122,7 @@ function get_app_filename { echo "MullvadVPN-${version}_x86_64.rpm" ;; windows*) - echo "MullvadVPN-${version}_x64.exe" + echo "MullvadVPN-${version}.exe" ;; macos*) echo "MullvadVPN-${version}.pkg" |