Skip to content

Commit 4379611

Browse files
committed
Bump arduino-cli to 0.29.0
1 parent 34d139e commit 4379611

File tree

3 files changed

+59
-52
lines changed

3 files changed

+59
-52
lines changed

Diff for: arduino/cli/commander.go

+14-10
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ type commander struct {
4343
// It directly imports the golang packages of the arduino-cli.
4444
func NewCommander() (arduino.Commander, error) {
4545
// Discard arduino-cli log info messages
46-
logrus.SetLevel(logrus.PanicLevel)
46+
logrus.SetLevel(logrus.ErrorLevel)
4747
// Initialize arduino-cli configuration
4848
configuration.Settings = configuration.Init(configuration.FindConfigFileInArgsOrWorkingDirectory(os.Args))
4949
// Create arduino-cli instance, needed to execute arduino-cli commands
@@ -52,14 +52,8 @@ func NewCommander() (arduino.Commander, error) {
5252
err = fmt.Errorf("creating arduino-cli instance: %w", err)
5353
return nil, err
5454
}
55-
errs := instance.Init(inst)
56-
if len(errs) > 0 {
57-
err = errors.New("initializing arduino-cli instance: received errors: ")
58-
for _, e := range errs {
59-
err = fmt.Errorf("%w%v; ", err, e)
60-
}
61-
return nil, err
62-
}
55+
56+
instance.Init(inst)
6357

6458
// Re-enable info level log
6559
logrus.SetLevel(logrus.InfoLevel)
@@ -74,11 +68,21 @@ func (c *commander) BoardList() ([]*rpc.DetectedPort, error) {
7468
Instance: c.Instance,
7569
Timeout: time.Second.Milliseconds(),
7670
}
77-
ports, err := board.List(req)
71+
72+
ports, errs, err := board.List(req)
7873
if err != nil {
7974
err = fmt.Errorf("%s: %w", "detecting boards", err)
8075
return nil, err
8176
}
77+
78+
if len(errs) > 0 {
79+
err = errors.New("starting discovery procedure: received errors: ")
80+
for _, e := range errs {
81+
err = fmt.Errorf("%w%v; ", err, e)
82+
}
83+
return nil, err
84+
}
85+
8286
return ports, nil
8387
}
8488

Diff for: go.mod

+6-10
Original file line numberDiff line numberDiff line change
@@ -5,35 +5,31 @@ go 1.16
55
require (
66
github.com/Microsoft/go-winio v0.5.1 // indirect
77
github.com/antihax/optional v1.0.0
8-
github.com/arduino/arduino-cli v0.0.0-20211220130253-5dd14c4c02b0
8+
github.com/arduino/arduino-cli v0.0.0-20221116144942-76251df9241a
99
github.com/arduino/board-discovery v0.0.0-20211020061712-fd83c2e3c908 // indirect
10-
github.com/arduino/go-paths-helper v1.6.1
11-
github.com/arduino/go-properties-orderedmap v1.7.0 // indirect
10+
github.com/arduino/go-paths-helper v1.7.0
1211
github.com/arduino/go-win32-utils v0.0.0-20180330194947-ed041402e83b
1312
github.com/arduino/iot-client-go v1.4.2
1413
github.com/gofrs/uuid v4.2.0+incompatible
1514
github.com/google/go-cmp v0.5.6
1615
github.com/h2non/filetype v1.1.3 // indirect
1716
github.com/howeyc/crc16 v0.0.0-20171223171357-2b2a61e366a6
18-
github.com/juju/errors v0.0.0-20210818161939-5560c4c073ff
17+
github.com/juju/errors v0.0.0-20210818161939-5560c4c073ff // indirect
1918
github.com/kevinburke/ssh_config v1.1.0 // indirect
2019
github.com/manifoldco/promptui v0.9.0
21-
github.com/mattn/go-runewidth v0.0.13 // indirect
2220
github.com/oleksandr/bonjour v0.0.0-20210301155756-30f43c61b915 // indirect
23-
github.com/segmentio/stats/v4 v4.6.3 // indirect
2421
github.com/sergi/go-diff v1.2.0 // indirect
2522
github.com/sirupsen/logrus v1.8.1
2623
github.com/spf13/cobra v1.3.0
2724
github.com/spf13/viper v1.10.1
28-
github.com/stretchr/testify v1.7.0
25+
github.com/stretchr/testify v1.8.0
2926
github.com/xanzy/ssh-agent v0.3.1 // indirect
3027
go.bug.st/serial v1.3.3
3128
go.bug.st/serial.v1 v0.0.0-20191202182710-24a6610f0541 // indirect
3229
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
33-
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
3430
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
35-
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
31+
golang.org/x/text v0.4.0 // indirect
3632
google.golang.org/grpc v1.43.0
37-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
33+
gopkg.in/yaml.v3 v3.0.1
3834
gotest.tools v2.2.0+incompatible
3935
)

0 commit comments

Comments
 (0)