Skip to content

Commit bf89b0e

Browse files
authored
Re-enable protobuf breaking change detection (#116)
1 parent 56b2fcb commit bf89b0e

File tree

3 files changed

+15
-19
lines changed

3 files changed

+15
-19
lines changed

.buildkite/Dockerfile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
1-
FROM golang:1.15.6
2-
3-
RUN apt update && apt install -y --no-install-recommends \
4-
protobuf-compiler \
5-
&& rm -rf /var/lib/apt/lists/* \
6-
# https://github.com/docker-library/golang/blob/c1baf037d71331eb0b8d4c70cff4c29cf124c5e0/1.4/Dockerfile
7-
&& mkdir -p /temporal
8-
9-
WORKDIR /temporal
1+
FROM temporalio/base-ci-builder:1.0.0
2+
WORKDIR /temporal

.buildkite/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ steps:
33
agents:
44
queue: "default"
55
docker: "*"
6-
command: "make"
6+
command: "make ci-build"
77
plugins:
88
- docker-compose#v3.1.0:
99
run: build

Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
$(VERBOSE).SILENT:
22
############################# Main targets #############################
3-
# Install everything, run all linters, and compile proto files.
4-
install: grpc-install api-linter-install buf-install proto
3+
ci-build: install proto
4+
5+
# Install dependencies.
6+
install: grpc-install api-linter-install buf-install
57

68
# Run all linters and compile proto files.
79
proto: grpc
@@ -43,21 +45,21 @@ fix-path:
4345
##### Plugins & tools #####
4446
grpc-install: gogo-protobuf-install
4547
printf $(COLOR) "Install/update gRPC plugins..."
46-
GO111MODULE=on go get google.golang.org/grpc@v1.34.0
48+
go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.1.0
4749

4850
gogo-protobuf-install: go-protobuf-install
49-
go get github.com/temporalio/gogo-protobuf/protoc-gen-gogoslick
51+
GO111MODULE=off go get github.com/temporalio/gogo-protobuf/protoc-gen-gogoslick
5052

5153
go-protobuf-install:
52-
GO111MODULE=on go get github.com/golang/protobuf/[email protected]
54+
go install github.com/golang/protobuf/[email protected]
5355

5456
api-linter-install:
5557
printf $(COLOR) "Install/update api-linter..."
56-
GO111MODULE=on go get github.com/googleapis/api-linter/cmd/api-linter@v1.10.0
58+
go install github.com/googleapis/api-linter/cmd/api-linter@v1.22.0
5759

5860
buf-install:
5961
printf $(COLOR) "Install/update buf..."
60-
GO111MODULE=on go get github.com/bufbuild/buf/cmd/buf@v0.33.0
62+
go install github.com/bufbuild/buf/cmd/buf@v0.43.2
6163

6264
##### Linters #####
6365
api-linter:
@@ -66,10 +68,11 @@ api-linter:
6668

6769
buf-lint:
6870
printf $(COLOR) "Run buf linter..."
69-
(cd $(PROTO_ROOT) && buf check lint)
71+
(cd $(PROTO_ROOT) && buf lint)
7072

7173
buf-breaking:
72-
@printf $(COLOR) "Run buf breaking changes check against master branch..."
74+
@printf $(COLOR) "Run buf breaking changes check against master branch..."
75+
@(cd $(PROTO_ROOT) && buf breaking --against '.git#branch=master')
7376

7477
##### Clean #####
7578
clean:

0 commit comments

Comments
 (0)