Skip to content

Commit 04ee17c

Browse files
silvanocerzacmaglie
authored andcommitted
[skip changelog] Update proto files build step
1 parent 16f4135 commit 04ee17c

File tree

20 files changed

+2751
-2583
lines changed

20 files changed

+2751
-2583
lines changed

.github/workflows/link-validation.yaml

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ tasks:
2020
all:
2121
desc: Build for distribution for all platforms
2222
cmds:
23+
- task: Linux_ARMv6
2324
- task: Windows_32bit
2425
- task: Windows_64bit
2526
- task: Linux_32bit
2627
- task: Linux_64bit
27-
- task: Linux_ARMv6
2828
- task: Linux_ARMv7
2929
- task: Linux_ARM64
3030
- task: macOS_64bit
@@ -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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 1 addition & 0 deletions
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

Lines changed: 3 additions & 1 deletion
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

Lines changed: 3 additions & 1 deletion
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

Lines changed: 3 additions & 1 deletion
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

Lines changed: 52 additions & 14 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)