Skip to content

Commit 84ab65f

Browse files
Replace prototool with buf (#847)
* Replace prototool with buf * Remove dep tooling references * Update protoc and buf versions * Add CI test to ensure files are consistently generated * Update Go version to 1.16 * Remove dependencies added by tool installs in CI * Update module file
1 parent 604a83d commit 84ab65f

File tree

16 files changed

+817
-844
lines changed

16 files changed

+817
-844
lines changed

.circleci/config.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ version: 2.1
33
executors:
44
test-executor:
55
docker:
6-
- image: circleci/golang:1.15.2
6+
- image: circleci/golang:1.16.2
77
auth:
88
username: mydockerhub-user
99
password: $DOCKERHUB_PASSWORD
1010
environment:
11-
PROTOTOOL_VER: 1.10.0
11+
BUF_VER: 0.40.0
12+
PROTOC_VER: 3.15.6
1213
working_directory: /go/src/github.com/improbable-eng/grpc-web
1314

1415
jobs:
@@ -23,10 +24,12 @@ jobs:
2324
steps:
2425
- checkout
2526
- run: sudo apt-get install unzip
26-
- run: . ./install-prototool.sh
27+
- run: . ./install-buf.sh
28+
- run: . ./install-protoc.sh
2729
- run: echo 'export GOBIN=/go/bin' >> $BASH_ENV
2830
- run: go get golang.org/x/tools/cmd/goimports
2931
- run: go get github.com/robertkrimen/godocdown/godocdown
32+
- run: go mod tidy # removes dependencies added by tool installations
3033
- run: go install github.com/golang/protobuf/protoc-gen-go
3134
- run:
3235
command: |
@@ -38,6 +41,8 @@ jobs:
3841
echo 'export NVM_DIR=$HOME/.nvm' >> $BASH_ENV
3942
echo 'source $NVM_DIR/nvm.sh' >> $BASH_ENV
4043
- run: npm install
44+
# Verify test files are correctly generated
45+
- run: cd integration_test && npm run build:proto && git diff --exit-code
4146
# Lint
4247
- run: ./lint-all.sh
4348
# Unit Tests

CONTRIBUTING.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
## Developer Tool Prerequisites
22
* [go](https://golang.org/doc/install) - The Go programming language
3-
* [dep](https://golang.github.io/dep/docs/installation.html) - Go dependency manager
43
* [nvm](https://github.com/creationix/nvm#installation) - Node Version Manager (for installing NodeJS and NPM)
54

65
## Performing a Fresh Checkout
@@ -19,7 +18,7 @@ nvm use
1918
npm install
2019
```
2120

22-
Note you will also need to [install prototool](https://github.com/uber/prototool/blob/dev/docs/install.md) and add it to your `PATH` environment variable if you wish to re-generate the integration test proto files.
21+
Note you will also need to [install buf](https://github.com/bufbuild/buf) and add it to your `PATH` environment variable if you wish to re-generate the integration test proto files.
2322

2423
## Testing Prerequisites
2524
Before you run the tests for the first time, please follow these steps:

0 commit comments

Comments
 (0)