Skip to content

Commit

Permalink
Update to gRPC 1.0.0 and protobuf 3.0.0. (#2012)
Browse files Browse the repository at this point in the history
  • Loading branch information
enisoc authored Sep 23, 2016
1 parent b78b82e commit 313d926
Show file tree
Hide file tree
Showing 43 changed files with 3,133 additions and 1,312 deletions.
2 changes: 1 addition & 1 deletion bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ fi
# install gRPC C++ base, so we can install the python adapters.
# this also installs protobufs
grpc_dist=$VTROOT/dist/grpc
grpc_ver=release-0_13_0
grpc_ver=v1.0.0
if [ $SKIP_ROOT_INSTALLS == "True" ]; then
echo "skipping grpc build, as root version was already installed."
elif [[ -f $grpc_dist/.build_finished && "$(cat $grpc_dist/.build_finished)" == "$grpc_ver" ]]; then
Expand Down
12 changes: 3 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,11 @@
"config": {
"vendor-dir": "php/vendor"
},
"repositories": [
{
"type": "vcs",
"url": "https://github.com/pixelfederation/datto-Protobuf-PHP-fake"
}
],
"require": {
"php": ">=5.5.0",
"stanley-cheung/protobuf-php": "1.0.x-dev",
"google/auth": "v0.7",
"grpc/grpc": "dev-release-0_13"
"stanley-cheung/protobuf-php": "v0.6",
"google/auth": "v0.10",
"grpc/grpc": "v1.0.0"
},
"autoload": {
"psr-4": {
Expand Down
183 changes: 105 additions & 78 deletions composer.lock

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

2 changes: 1 addition & 1 deletion docker/bootstrap/Dockerfile.common
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN export MAKEFLAGS="-j$(nproc)" && \
curl -sL --connect-timeout 10 --retry 3 \
https://phar.phpunit.de/phpunit-4.8.9.phar > /vt/bin/phpunit && \
chmod +x /vt/bin/phpunit && \
curl -sS --connect-timeout 10 --retry 3 \
curl -sL --connect-timeout 10 --retry 3 \
https://getcomposer.org/installer | php -- --install-dir=/vt/bin --filename=composer && \
pecl install xdebug && \
echo "zend_extension=$(pecl config-get ext_dir default)/xdebug.so" > /etc/php5/cli/conf.d/20-xdebug.ini
Expand Down
2 changes: 1 addition & 1 deletion go/vt/proto/query/query.pb.go

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

Loading

0 comments on commit 313d926

Please sign in to comment.