Pull request 57: AGDNS-2151 ARM64 MSI

Squashed commit of the following:

commit 87d41f0
Author: Eugene Burkov <[email protected]>
Date:   Thu Jun 27 19:42:00 2024 +0300

    all: fix labels, imp msi build

commit 3636dba
Author: Eugene Burkov <[email protected]>
Date:   Thu Jun 27 18:41:26 2024 +0300

    all: build arm64 msi

CHANGELOG.md

@@ -16,6 +16,10 @@ See also the [v0.0.2 GitHub milestone][ms-v0.0.2].
 NOTE: Add new changes BELOW THIS COMMENT.
 -->
 
+### Added
+
+- MSI installer for the ARM64 architecture in addition to the existing x86 and x64 installers.
+
 ### Changed
 
 - Path to the executable is now validated when the application installs itself as a `launchd` service on macOS ([#2]).

bamboo-specs/bamboo.yaml

@@ -216,13 +216,13 @@
         'shared': true
         'required': true
     -
-        'name': 'AdGuardDNSClient_windows_amd64'
-        'pattern': '${bamboo.name}/dist/AdGuardDNSClient_windows_amd64.zip'
+        'name': 'AdGuardDNSClient_windows_amd64_msi'
+        'pattern': '${bamboo.name}/dist/AdGuardDNSClient_windows_amd64.msi'
         'shared': true
         'required': true
     -
-        'name': 'AdGuardDNSClient_windows_amd64_msi'
-        'pattern': '${bamboo.name}/dist/AdGuardDNSClient_windows_amd64.msi'
+        'name': 'AdGuardDNSClient_windows_arm64_msi'
+        'pattern': '${bamboo.name}/dist/AdGuardDNSClient_windows_arm64.msi'
         'shared': true
         'required': true
     -
@@ -273,7 +273,7 @@
 
               make\
                   ARCH="amd64"\
-                  OS="windows darwin linux"\
+                  OS="darwin linux"\
                   CHANNEL=${bamboo.channel}\
                   GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
                   DEPLOY_SCRIPT_PATH="../bamboo-deploy-publisher/deploy.sh"\
@@ -282,10 +282,9 @@
                   VERBOSE=2\
                   build-release
 
-              # Build windows/386 separately to avoid building it for another
-              # OSes.
+              # Build Windows separately to build MSI installers for all
+              # supported architectures.
               make\
-                  ARCH="386"\
                   OS="windows"\
                   CHANNEL=${bamboo.channel}\
                   GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\

msi/info.wxi

@@ -62,8 +62,6 @@
   ProductName="AdGuard DNS Client" ?>
   <?define
   Manufacturer="Adguard Software Limited" ?>
-  <?define
-  InstallerDescription="[ProductName] Installer" ?>
 
   <!--
     Define the installer label's text.

msi/product.wxs

@@ -32,7 +32,7 @@
     <Package
         Id="$(var.PackageCode)"
         InstallerVersion="500"
-        Description="$(var.InstallerDescription)"
+        Description="$(var.ProductName) $(var.ProductVersion)"
         Compressed="yes"
         Keywords="Installer"
         Manufacturer="$(var.Manufacturer)"

scripts/make/build-release.sh

@@ -195,7 +195,12 @@ build_msi() {
 	('386')
 		msi_arch='x86'
 		;;
-	('amd64')
+	('amd64'|'arm64')
+		# Use the value of 'x64' for ARM64 installer, since wixl only considers
+		# this option when specifying component's Win64 attribute value, which
+		# is 'yes' by default for ARM64 architecture.
+		#
+		# See https://wixtoolset.org/docs/v3/xsd/wix/component.
 		msi_arch='x64'
 		;;
 	(*)
@@ -281,10 +286,7 @@ build() {
 	in
 	('windows')
 		# TODO(e.burkov):  Consider building only MSI installers for Windows.
-
-		# TODO(e.burkov):  Add ARM-compatible MSI installer, when
-		# https://gitlab.gnome.org/GNOME/msitools/-/issues/61 is resolved.
-		if [ "$msi" -eq 1 ] && [ "$build_arch" != "arm64" ]
+		if [ "$msi" -eq 1 ]
 		then
 			build_msi "$build_arch" "./${dist}/${build_ar}.msi" "$build_dir"
 		fi

scripts/make/go-build.sh

@@ -72,7 +72,7 @@ readonly parallelism
 # the default value.
 if [ "${parallelism}" != '' ]
 then
-        GOFLAGS="${GOFLAGS:-} -p=${parallelism}"
+    GOFLAGS="${GOFLAGS:-} -p=${parallelism}"
 fi
 readonly GOFLAGS
 export GOFLAGS