Skip to content

Commit 1b8a0ed

Browse files
silvanocerzasilvanocerza
committed
[skip changelog] Update proto files build step
1 parent 15e81ed commit 1b8a0ed

26 files changed

+2770
-2652
lines changed

‎.github/workflows/link-validation.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ jobs:
2525
- name: Install Go
2626
uses: actions/setup-go@v2
2727
with:
28-
go-version: "1.14"
28+
go-version: "1.16"
2929

3030
- name: Installs Go dependencies
3131
shell: bash
32-
run: go get -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
32+
run: go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.4.1
3333

3434
- name: Install protoc compiler
3535
uses: arduino/setup-protoc@v1

‎.github/workflows/test.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
go get golang.org/x/lint/golint
3434
go get github.com/golang/protobuf/protoc-gen-go
3535
go get github.com/cmaglie/go.rice/rice
36+
go get google.golang.org/grpc/cmd/protoc-gen-go-grpc
3637
shell: bash
3738

3839
- name: Install Taskfile

‎.github/workflows/validate-docs.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ jobs:
3939
- name: Setup Go
4040
uses: actions/setup-go@v2
4141
with:
42-
go-version: "1.14"
42+
go-version: "1.16"
4343

4444
- name: Install Go dependencies
4545
run: |
4646
go version
47-
go get -u github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
47+
go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc@v1.4.1
4848
4949
- name: Install protoc compiler
5050
uses: arduino/setup-protoc@v1

‎DistTasks.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,5 +207,5 @@ tasks:
207207

208208
vars:
209209
CONTAINER: "docker.elastic.co/beats-dev/golang-crossbuild"
210-
GO_VERSION: "1.14.7"
210+
GO_VERSION: "1.15.10"
211211
CHECKSUM_FILE: "{{ .VERSION }}-checksums.txt"

‎Taskfile.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ tasks:
8686
protoc:compile:
8787
desc: Compile protobuf definitions
8888
cmds:
89-
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/cc/arduino/cli/commands/v1/*.proto'
90-
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/cc/arduino/cli/monitor/v1/*.proto'
91-
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/cc/arduino/cli/settings/v1/*.proto'
92-
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=plugins=grpc,paths=source_relative:rpc ./rpc/cc/arduino/cli/debug/v1/*.proto'
89+
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=./rpc --go_opt=paths=source_relative --go-grpc_out=./rpc --go-grpc_opt=paths=source_relative ./rpc/cc/arduino/cli/commands/v1/*.proto'
90+
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=./rpc --go_opt=paths=source_relative --go-grpc_out=./rpc --go-grpc_opt=paths=source_relative ./rpc/cc/arduino/cli/monitor/v1/*.proto'
91+
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=./rpc --go_opt=paths=source_relative --go-grpc_out=./rpc --go-grpc_opt=paths=source_relative ./rpc/cc/arduino/cli/settings/v1/*.proto'
92+
- '{{ default "protoc" .PROTOC_BINARY }} --proto_path=rpc --go_out=./rpc --go_opt=paths=source_relative --go-grpc_out=./rpc --go-grpc_opt=paths=source_relative ./rpc/cc/arduino/cli/debug/v1/*.proto'
9393

9494
protoc:docs:
9595
desc: Generate docs for protobuf definitions

‎commands/daemon/daemon.go

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434

3535
// ArduinoCoreServerImpl FIXMEDOC
3636
type ArduinoCoreServerImpl struct {
37+
rpc.UnimplementedArduinoCoreServiceServer
3738
VersionString string
3839
}
3940

‎commands/daemon/debug.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ import (
2626
)
2727

2828
// DebugService implements the `Debug` service
29-
type DebugService struct{}
29+
type DebugService struct {
30+
dbg.UnimplementedDebugServiceServer
31+
}
3032

3133
// Debug returns a stream response that can be used to fetch data from the
3234
// target. The first message passed through the `Debug` request must

‎commands/daemon/monitor.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ import (
2525
)
2626

2727
// MonitorService implements the `Monitor` service
28-
type MonitorService struct{}
28+
type MonitorService struct {
29+
rpc.UnimplementedMonitorServiceServer
30+
}
2931

3032
// StreamingOpen returns a stream response that can be used to fetch data from the
3133
// monitor target. The first message passed through the `StreamingOpenReq` must

‎commands/daemon/settings.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ import (
2727
)
2828

2929
// SettingsService implements the `Settings` service
30-
type SettingsService struct{}
30+
type SettingsService struct {
31+
rpc.UnimplementedSettingsServiceServer
32+
}
3133

3234
// GetAll returns a message with a string field containing all the settings
3335
// currently in use, marshalled in JSON format.

‎docsgen/go.sum

+52-14
Large diffs are not rendered by default.

‎go.mod

+9-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/fluxio/iohelpers v0.0.0-20160419043813-3a4dd67a94d2 // indirect
1717
github.com/fluxio/multierror v0.0.0-20160419044231-9c68d39025e5 // indirect
1818
github.com/gofrs/uuid v3.2.0+incompatible
19-
github.com/golang/protobuf v1.4.2
19+
github.com/golang/protobuf v1.5.2
2020
github.com/h2non/filetype v1.0.8 // indirect
2121
github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 // indirect
2222
github.com/kr/text v0.2.0 // indirect
@@ -38,16 +38,19 @@ require (
3838
github.com/spf13/jwalterweatherman v1.0.0
3939
github.com/spf13/viper v1.6.2
4040
github.com/stretchr/testify v1.6.1
41+
github.com/xanzy/ssh-agent v0.2.1 // indirect
4142
go.bug.st/cleanup v1.0.0
4243
go.bug.st/downloader/v2 v2.1.1
4344
go.bug.st/relaxed-semver v0.0.0-20190922224835-391e10178d18
4445
go.bug.st/serial v1.1.2
4546
go.bug.st/serial.v1 v0.0.0-20180827123349-5f7892a7bb45 // indirect
46-
golang.org/x/crypto v0.0.0-20200406173513-056763e48d71
47-
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
48-
golang.org/x/text v0.3.2
49-
google.golang.org/grpc v1.27.0
50-
google.golang.org/protobuf v1.25.0
47+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
48+
golang.org/x/net v0.0.0-20210505024714-0287a6fb4125
49+
golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 // indirect
50+
golang.org/x/text v0.3.6
51+
google.golang.org/genproto v0.0.0-20210504143626-3b2ad6ccc450 // indirect
52+
google.golang.org/grpc v1.37.0
53+
google.golang.org/protobuf v1.26.0
5154
gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
5255
gopkg.in/src-d/go-git.v4 v4.13.1
5356
gopkg.in/yaml.v2 v2.3.0

0 commit comments

Comments
 (0)