Skip to content

Commit 1ec0a8c

Browse files
feat: use Arduino CLI 1.0.4 (#2457)
* fix: use `@pingghost/protoc` to compile proto files The npm package previously used (`protoc`) is still lacking apple arm32 support, see YePpHa/node-protoc#10 * feat: use Arduino CLI 1.0.4 * fix: allow use of node16 in github actions * chore: update `arduino-language-server` version for cli-1.0.0 * fix: deprecated platform order test Arduino deprecated platforms should have more priority then other deprecated ones
1 parent c3adde5 commit 1ec0a8c

28 files changed

+10139
-1897
lines changed

arduino-ide-extension/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
},
129129
"optionalDependencies": {
130130
"grpc-tools": "^1.12.4",
131-
"protoc": "^1.0.4"
131+
"@pingghost/protoc": "^1.0.2"
132132
},
133133
"mocha": {
134134
"require": [
@@ -170,7 +170,7 @@
170170
],
171171
"arduino": {
172172
"arduino-cli": {
173-
"version": "0.36.0-rc.1"
173+
"version": "1.0.4"
174174
},
175175
"arduino-fwuploader": {
176176
"version": "2.4.1"
@@ -179,7 +179,7 @@
179179
"version": {
180180
"owner": "arduino",
181181
"repo": "arduino-language-server",
182-
"commitish": "91c2ba8"
182+
"commitish": "05ec308"
183183
}
184184
},
185185
"clangd": {

arduino-ide-extension/scripts/generate-protocol.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
const { exec } = require('./utils');
88
const glob = require('glob');
99
const { SemVer, gte, valid: validSemVer } = require('semver');
10-
const protoc = path.dirname(require('protoc/protoc'));
11-
10+
// Use a node-protoc fork until apple arm32 is supported
11+
// https://github.com/YePpHa/node-protoc/pull/10
12+
const protoc = path.dirname(require('@pingghost/protoc/protoc'));
1213
const repository = await fs.mkdtemp(path.join(os.tmpdir(), 'arduino-cli-'));
1314

1415
const { owner, repo, commitish } = (() => {

arduino-ide-extension/src/node/boards-service-impl.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ function createBoardsPackage(
585585
if (!actualRelease) {
586586
return undefined;
587587
}
588-
const { name, typeList, boardsList, deprecated, compatible } = actualRelease;
588+
const { name, typesList, boardsList, deprecated, compatible } = actualRelease;
589589
if (!compatible) {
590590
return undefined; // never show incompatible platforms
591591
}
@@ -602,7 +602,7 @@ function createBoardsPackage(
602602
),
603603
description: boardsList.map(({ name }) => name).join(', '),
604604
boards: boardsList,
605-
types: typeList,
605+
types: typesList,
606606
moreInfoLink: website,
607607
author: maintainer,
608608
deprecated,

arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/board_pb.d.ts

+5
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,10 @@ export class BoardListResponse extends jspb.Message {
384384
getPortsList(): Array<DetectedPort>;
385385
setPortsList(value: Array<DetectedPort>): BoardListResponse;
386386
addPorts(value?: DetectedPort, index?: number): DetectedPort;
387+
clearWarningsList(): void;
388+
getWarningsList(): Array<string>;
389+
setWarningsList(value: Array<string>): BoardListResponse;
390+
addWarnings(value: string, index?: number): string;
387391

388392
serializeBinary(): Uint8Array;
389393
toObject(includeInstance?: boolean): BoardListResponse.AsObject;
@@ -398,6 +402,7 @@ export class BoardListResponse extends jspb.Message {
398402
export namespace BoardListResponse {
399403
export type AsObject = {
400404
portsList: Array<DetectedPort.AsObject>,
405+
warningsList: Array<string>,
401406
}
402407
}
403408

arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/board_pb.js

+51-2
Original file line numberDiff line numberDiff line change
@@ -3387,7 +3387,7 @@ proto.cc.arduino.cli.commands.v1.BoardListRequest.prototype.setFqbn = function(v
33873387
* @private {!Array<number>}
33883388
* @const
33893389
*/
3390-
proto.cc.arduino.cli.commands.v1.BoardListResponse.repeatedFields_ = [1];
3390+
proto.cc.arduino.cli.commands.v1.BoardListResponse.repeatedFields_ = [1,2];
33913391

33923392

33933393

@@ -3421,7 +3421,8 @@ proto.cc.arduino.cli.commands.v1.BoardListResponse.prototype.toObject = function
34213421
proto.cc.arduino.cli.commands.v1.BoardListResponse.toObject = function(includeInstance, msg) {
34223422
var f, obj = {
34233423
portsList: jspb.Message.toObjectList(msg.getPortsList(),
3424-
proto.cc.arduino.cli.commands.v1.DetectedPort.toObject, includeInstance)
3424+
proto.cc.arduino.cli.commands.v1.DetectedPort.toObject, includeInstance),
3425+
warningsList: (f = jspb.Message.getRepeatedField(msg, 2)) == null ? undefined : f
34253426
};
34263427

34273428
if (includeInstance) {
@@ -3463,6 +3464,10 @@ proto.cc.arduino.cli.commands.v1.BoardListResponse.deserializeBinaryFromReader =
34633464
reader.readMessage(value,proto.cc.arduino.cli.commands.v1.DetectedPort.deserializeBinaryFromReader);
34643465
msg.addPorts(value);
34653466
break;
3467+
case 2:
3468+
var value = /** @type {string} */ (reader.readString());
3469+
msg.addWarnings(value);
3470+
break;
34663471
default:
34673472
reader.skipField();
34683473
break;
@@ -3500,6 +3505,13 @@ proto.cc.arduino.cli.commands.v1.BoardListResponse.serializeBinaryToWriter = fun
35003505
proto.cc.arduino.cli.commands.v1.DetectedPort.serializeBinaryToWriter
35013506
);
35023507
}
3508+
f = message.getWarningsList();
3509+
if (f.length > 0) {
3510+
writer.writeRepeatedString(
3511+
2,
3512+
f
3513+
);
3514+
}
35033515
};
35043516

35053517

@@ -3541,6 +3553,43 @@ proto.cc.arduino.cli.commands.v1.BoardListResponse.prototype.clearPortsList = fu
35413553
};
35423554

35433555

3556+
/**
3557+
* repeated string warnings = 2;
3558+
* @return {!Array<string>}
3559+
*/
3560+
proto.cc.arduino.cli.commands.v1.BoardListResponse.prototype.getWarningsList = function() {
3561+
return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 2));
3562+
};
3563+
3564+
3565+
/**
3566+
* @param {!Array<string>} value
3567+
* @return {!proto.cc.arduino.cli.commands.v1.BoardListResponse} returns this
3568+
*/
3569+
proto.cc.arduino.cli.commands.v1.BoardListResponse.prototype.setWarningsList = function(value) {
3570+
return jspb.Message.setField(this, 2, value || []);
3571+
};
3572+
3573+
3574+
/**
3575+
* @param {string} value
3576+
* @param {number=} opt_index
3577+
* @return {!proto.cc.arduino.cli.commands.v1.BoardListResponse} returns this
3578+
*/
3579+
proto.cc.arduino.cli.commands.v1.BoardListResponse.prototype.addWarnings = function(value, opt_index) {
3580+
return jspb.Message.addToRepeatedField(this, 2, value, opt_index);
3581+
};
3582+
3583+
3584+
/**
3585+
* Clears the list making it empty but non-null.
3586+
* @return {!proto.cc.arduino.cli.commands.v1.BoardListResponse} returns this
3587+
*/
3588+
proto.cc.arduino.cli.commands.v1.BoardListResponse.prototype.clearWarningsList = function() {
3589+
return this.setWarningsList([]);
3590+
};
3591+
3592+
35443593

35453594
/**
35463595
* List of repeated fields within this message type.

0 commit comments

Comments
 (0)