From 2e1763f19aa33ef90057374d997fcc3be7bdc5c9 Mon Sep 17 00:00:00 2001
From: Alexis Svinartchouk <alexis@resin.io>
Date: Thu, 7 Mar 2019 15:20:07 +0100
Subject: [PATCH 1/2] Fix Makefile

Change-type: patch
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b949a704..3ee33c7f 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@
 # ---------------------------------------------------------------------
 
 RESIN_SCRIPTS ?= ./scripts/resin
+NPM_VERSION ?= 6.7.0
 S3_BUCKET = artifacts.ci.balena-cloud.com
 
 # This directory will be completely deleted by the `clean` rule
@@ -97,8 +98,7 @@ electron-develop: | $(BUILD_TEMPORARY_DIRECTORY)
 		-b $(shell pwd) \
 		-r $(TARGET_ARCH) \
 		-s $(PLATFORM) \
-		-n $(BUILD_TEMPORARY_DIRECTORY)/npm \
-		-a $(S3_BUCKET)
+		-m $(NPM_VERSION)
 
 electron-test:
 	$(RESIN_SCRIPTS)/electron/test.sh \

From 7f8f38ddf154ac9d68f51d6055f47d2e378fa7f7 Mon Sep 17 00:00:00 2001
From: Alexis Svinartchouk <alexis@resin.io>
Date: Thu, 7 Mar 2019 15:38:26 +0100
Subject: [PATCH 2/2] Update resin-scripts

Changelog-entry: Update resin-scripts
Change-type: patch
---
 scripts/resin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/resin b/scripts/resin
index 72c17151..c95db735 160000
--- a/scripts/resin
+++ b/scripts/resin
@@ -1 +1 @@
-Subproject commit 72c17151e38967d56d574376845ecc67629fa10a
+Subproject commit c95db735919edb9ab9f0d454468f01c818f72281