From bba2b68f3d29193bc18b39f4507c2c741b68a1fd Mon Sep 17 00:00:00 2001
From: Jari Kolehmainen <jari.kolehmainen@gmail.com>
Date: Tue, 31 Aug 2021 09:54:52 +0300
Subject: [PATCH] fixes

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
---
 .azure-pipelines.yml       |  2 ++
 .github/workflows/test.yml | 16 +++++++++-------
 Makefile                   |  5 ++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index f6bcf46dbc..3e1b43f875 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -56,6 +56,7 @@ jobs:
           AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID)
           AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY)
           BUILD_NUMBER: $(Build.BuildNumber)
+          ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --ia32"
         displayName: Build
 
   - job: macOS
@@ -103,6 +104,7 @@ jobs:
           AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID)
           AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY)
           BUILD_NUMBER: $(Build.BuildNumber)
+          ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --arm64"
         displayName: Build
 
   - job: Linux
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 63d37871cd..b319c97770 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -83,13 +83,15 @@ jobs:
         if: runner.os == 'Linux'
 
       - run: make integration
-        name: Run integration tests
-        shell: bash
-        if: runner.os != 'Linux'
-
-      - run: make build
-        name: Test build (arm64)
+        name: Run macOS integration tests
         shell: bash
         env:
-          BINARY_ARCH: arm64
+          ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --arm64"
         if: runner.os == 'macOS'
+
+      - run: make integration
+        name: Run Windows integration tests
+        shell: bash
+        env:
+          ELECTRON_BUILDER_EXTRA_ARGS: "--x64 --ia32"
+        if: runner.os == 'Windows'
diff --git a/Makefile b/Makefile
index b832da1117..cf6f988af1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ CMD_ARGS = $(filter-out $@,$(MAKECMDGOALS))
   @:
 
 NPM_RELEASE_TAG ?= latest
+ELECTRON_BUILDER_EXTRA_ARGS ?=
 EXTENSIONS_DIR = ./extensions
 extensions = $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), ${dir})
 extension_node_modules = $(foreach dir, $(wildcard $(EXTENSIONS_DIR)/*), ${dir}/node_modules)
@@ -62,10 +63,8 @@ build: node_modules binaries/client
 ifeq "$(DETECTED_OS)" "Windows"
 # https://github.com/ukoloff/win-ca#clear-pem-folder-on-publish
 	rm -rf node_modules/win-ca/pem
-	yarn run electron-builder --publish onTag --x64 --ia32
-else
-	yarn run electron-builder --publish onTag --x64 --arm64
 endif
+	yarn run electron-builder --publish onTag $(ELECTRON_BUILDER_EXTRA_ARGS)
 
 $(extension_node_modules): node_modules
 	cd $(@:/node_modules=) && ../../node_modules/.bin/npm install --no-audit --no-fund