From f815e8511fafabbe1d73b8bbef4d7a8b57c8049d Mon Sep 17 00:00:00 2001 From: Alexis Svinartchouk Date: Wed, 15 May 2019 18:52:05 +0200 Subject: [PATCH] Build packages that support both ia32 and x64 on windows Changelog-entry: windows installer and portable version support both ia32 and x64 Change-type: patch --- .resinci.json | 2 +- electron-builder.yml | 8 ++++---- scripts/resin | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.resinci.json b/.resinci.json index 777756e2..601705a6 100644 --- a/.resinci.json +++ b/.resinci.json @@ -16,7 +16,7 @@ "appId": "io.balena.etcher", "copyright": "Copyright 2016-2019 Balena Ltd", "productName": "balenaEtcher", - "nodeGypRebuild": false, + "nodeGypRebuild": true, "files": [ "!lib/gui/app", "lib/gui/app/index.html", diff --git a/electron-builder.yml b/electron-builder.yml index bb72fbe6..e7cbdfc6 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -1,8 +1,8 @@ appId: io.balena.etcher copyright: Copyright 2016-2019 Balena Ltd productName: balenaEtcher -npmRebuild: false -nodeGypRebuild: false +npmRebuild: true +nodeGypRebuild: true publish: null files: - lib @@ -37,9 +37,9 @@ nsis: uninstallerIcon: assets/icon.ico deleteAppDataOnUninstall: true license: LICENSE - artifactName: "${productName}-Setup-${version}-${env.TARGET_ARCH}.${ext}" + artifactName: "${productName}-Setup-${version}.${ext}" portable: - artifactName: "${productName}-Portable-${version}-${env.TARGET_ARCH}.${ext}" + artifactName: "${productName}-Portable-${version}.${ext}" requestExecutionLevel: user linux: category: Utility diff --git a/scripts/resin b/scripts/resin index 1a1e90b4..1b5bb595 160000 --- a/scripts/resin +++ b/scripts/resin @@ -1 +1 @@ -Subproject commit 1a1e90b427c4e6d5b8031f3092a66cd832dbbd07 +Subproject commit 1b5bb595fe00a81e9a12df654c9909e674997dd9