From 657397b1776148db0f1d2e43739c91344666c43d Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Tue, 9 Apr 2019 17:01:19 +0100 Subject: [PATCH 1/3] Add separate platform electron build commands Add commands for building separate electron builds for each platform --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index 874e11bf..69c0f4ae 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,9 @@ "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production", "build:bundle:dev": "webpack --progress --bail --mode development", "build:electron": "yarn clean && yarn build && yarn install:electron && build -wml --ia32 --x64", + "build:electron:linux": "npm run build && build -l --ia32 --x64", + "build:electron:macos": "npm run build && build -m --ia32 --x64", + "build:electron:windows": "npm run build && build -w --ia32 --x64", "build:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk build", "build:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:init", "build": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle", From 38b661e2cb641cf7f28ee92ff7812dff06a47a27 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Tue, 9 Apr 2019 17:03:58 +0100 Subject: [PATCH 2/3] Switch to yarn --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 69c0f4ae..57ad8b5b 100644 --- a/package.json +++ b/package.json @@ -36,9 +36,9 @@ "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production", "build:bundle:dev": "webpack --progress --bail --mode development", "build:electron": "yarn clean && yarn build && yarn install:electron && build -wml --ia32 --x64", - "build:electron:linux": "npm run build && build -l --ia32 --x64", - "build:electron:macos": "npm run build && build -m --ia32 --x64", - "build:electron:windows": "npm run build && build -w --ia32 --x64", + "build:electron:linux": "yarn build && build -l --ia32 --x64", + "build:electron:macos": "yarn build && build -m --ia32 --x64", + "build:electron:windows": "yarn build && build -w --ia32 --x64", "build:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk build", "build:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:init", "build": "yarn build:js-sdk && yarn build:react-sdk && yarn reskindex && yarn build:res && yarn build:bundle", From 96be8ad072c16e78ba3e91943a9bad9ac9bfa236 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Tue, 9 Apr 2019 18:24:30 +0100 Subject: [PATCH 3/3] Remove 32-bit builds for MacOS and Linux --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 57ad8b5b..cbc1c5ef 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "build:bundle": "cross-env NODE_ENV=production webpack -p --progress --bail --mode production", "build:bundle:dev": "webpack --progress --bail --mode development", "build:electron": "yarn clean && yarn build && yarn install:electron && build -wml --ia32 --x64", - "build:electron:linux": "yarn build && build -l --ia32 --x64", - "build:electron:macos": "yarn build && build -m --ia32 --x64", + "build:electron:linux": "yarn build && build -l --x64", + "build:electron:macos": "yarn build && build -m --x64", "build:electron:windows": "yarn build && build -w --ia32 --x64", "build:react-sdk": "node scripts/yarn-sub.js matrix-react-sdk build", "build:js-sdk": "node scripts/yarn-sub.js matrix-js-sdk start:init",