Skip to content

Commit

Permalink
all: build arm64 msi
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeneOne1 committed Jun 27, 2024
1 parent da3b068 commit 3636dba
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ARM64 architecture.

### Changed

- Path to the executable is now validated when the application installs itself as a `launchd` service on macOS ([#2]).
Expand Down
12 changes: 12 additions & 0 deletions bamboo-specs/bamboo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,18 @@
VERBOSE=2\
build-release
# TODO(e.burkov): !! Remove.
make\
ARCH="arm64"\
OS="windows"\
CHANNEL=${bamboo.channel}\
GPG_KEY_PASSPHRASE=${bamboo.gpgPassword}\
DEPLOY_SCRIPT_PATH="../bamboo-deploy-publisher/deploy.sh"\
SIGNER_API_KEY="${bamboo.adguardDnsClientWinSignerSecretApiKey}"\
PARALLELISM=1\
VERBOSE=2\
build-release
'Publish':
'artifact-subscriptions':
- 'artifact': 'AdGuardDNSClient_darwin_amd64'
Expand Down
7 changes: 2 additions & 5 deletions scripts/make/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ build_msi() {

case "$msi_exe_arch"
in
('386')
('386'|'arm64')
msi_arch='x86'
;;
('amd64')
Expand Down Expand Up @@ -281,10 +281,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
Expand Down
2 changes: 1 addition & 1 deletion scripts/make/go-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3636dba

Please sign in to comment.