Skip to content

Commit

Permalink
Download protoc when generating protos (#80)
Browse files Browse the repository at this point in the history
* Download protoc when generating protos. Fixes #78

* Fix bash

* Improve message

* Use a variable for version of protoc

* Remove install-protobuf

* CR
  • Loading branch information
easyCZ authored and jonnyreeves committed May 29, 2018
1 parent dd6d3d3 commit be22282
Show file tree
Hide file tree
Showing 17 changed files with 122 additions and 105 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ npm-debug*
lib/
**/mocha-report.json
bazel-*
protoc/
1 change: 0 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ test/
src/
.*
release.sh
install-protobuf.sh
generate.sh
examples/
5 changes: 0 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
language: node_js
env:
- PROTOBUF_VER="3.2.0"
before_deploy: |
PKG_VERSION=$(node -p "require('./package.json').version")
SHORT_COMMIT_HASH=$(git rev-parse --short HEAD)
Expand Down Expand Up @@ -36,9 +34,6 @@ before_install:
- wget https://github.com/bazelbuild/bazel/releases/download/0.11.0/bazel_0.11.0-linux-x86_64.deb
- sudo dpkg -i bazel_0.11.0-linux-x86_64.deb
install:
- sudo apt-get install unzip
- bash install-protobuf.sh
- export PATH=$TRAVIS_BUILD_DIR/protobuf/bin:$PATH
- npm install
script:
- ./travis-ci-build.sh
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,4 +96,6 @@ client.getUser(req, (err, user) => { /* ... */ });
```

## Examples
For a sample of the generated protos and service definitions, see [examples](https://github.com/improbable-eng/ts-protoc-gen/tree/master/examples)
For a sample of the generated protos and service definitions, see [examples](https://github.com/improbable-eng/ts-protoc-gen/tree/master/examples).

To generate the examples from protos, please run `./generate.sh`
4 changes: 2 additions & 2 deletions examples/generated/examplecom/enum_message_pb.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/generated/examplecom/map_message_pb.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/generated/examplecom/oneof_message_pb.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/generated/examplecom/parent_message_v3_pb.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions examples/generated/examplecom/primitive_message_v3_pb.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit be22282

Please sign in to comment.