From 0afb3ab68738935b10d1d8d31a5d32d306cbd0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 6 Apr 2018 15:48:31 +0200 Subject: [PATCH] Pull the Agent repo and make sure it's on master, so that the relevant binary configuration will be used. --- lib/agent | 2 +- scripts/make-release.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/agent b/lib/agent index 179c982..b8f35df 160000 --- a/lib/agent +++ b/lib/agent @@ -1 +1 @@ -Subproject commit 179c982bfbd6f36cedf111dd8e3f6b9c3b368106 +Subproject commit b8f35df1556a32325daf5cb470f77bd894539e53 diff --git a/scripts/make-release.js b/scripts/make-release.js index 89ca0f4..4b1db6a 100755 --- a/scripts/make-release.js +++ b/scripts/make-release.js @@ -36,6 +36,7 @@ for (const device of package.devices) { mkdir('-p', deviceDir); chmod(644, deviceSource); cp(deviceSource, `${deviceDir}/firmware.hex`); + exec(`cd ${usbDir}; git pull origin master; git checkout master`); exec(`${usbDir}/user-config-json-to-bin.ts ${deviceDir}/config.bin`); }