From ae6aec27db3b94ed004f2fc5d2f5bc47ba9afebb Mon Sep 17 00:00:00 2001 From: Akos Kitta Date: Mon, 29 Jun 2020 13:19:43 +0200 Subject: [PATCH] Updated the CLI to `0.11.0`. - Adjusted to gRPC API change, and - Log the CLI commit only once when generating from protoc. Signed-off-by: Akos Kitta --- arduino-ide-extension/scripts/download-cli.js | 2 +- arduino-ide-extension/scripts/generate-protocol.js | 3 --- arduino-ide-extension/src/node/boards-service-impl.ts | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arduino-ide-extension/scripts/download-cli.js b/arduino-ide-extension/scripts/download-cli.js index 92ee2b09..63fa55a1 100755 --- a/arduino-ide-extension/scripts/download-cli.js +++ b/arduino-ide-extension/scripts/download-cli.js @@ -10,7 +10,7 @@ (() => { - const DEFAULT_VERSION = '0.9.0'; // require('moment')().format('YYYYMMDD'); + const DEFAULT_VERSION = '0.11.0'; // require('moment')().format('YYYYMMDD'); const path = require('path'); const shell = require('shelljs'); diff --git a/arduino-ide-extension/scripts/generate-protocol.js b/arduino-ide-extension/scripts/generate-protocol.js index 6e4f489e..c62e3eb1 100644 --- a/arduino-ide-extension/scripts/generate-protocol.js +++ b/arduino-ide-extension/scripts/generate-protocol.js @@ -39,9 +39,6 @@ if (shell.exec(`git -C ${repository} rev-parse --abbrev-ref HEAD`).code !== 0) { shell.exit(1); } - if (shell.exec(`git -C ${repository} rev-parse --short HEAD`).code !== 0) { - shell.exit(1); - } const pluginExec = shell.which('grpc_tools_node_protoc_plugin'); if (!pluginExec || pluginExec.code !== 0) { diff --git a/arduino-ide-extension/src/node/boards-service-impl.ts b/arduino-ide-extension/src/node/boards-service-impl.ts index a5074d23..176895c5 100644 --- a/arduino-ide-extension/src/node/boards-service-impl.ts +++ b/arduino-ide-extension/src/node/boards-service-impl.ts @@ -220,7 +220,7 @@ export class BoardsServiceImpl implements BoardsService { resolve(resp); })); - const requiredTools = resp.getRequiredToolsList().map(t => { + const requiredTools = resp.getToolsdependenciesList().map(t => { name: t.getName(), packager: t.getPackager(), version: t.getVersion()