diff options
| -rw-r--r-- | jenkins/docker/Dockerfile | 6 | ||||
| -rw-r--r-- | jenkins/docker32/Dockerfile | 2 | ||||
| -rw-r--r-- | src/google/protobuf/compiler/php/php_generator.cc | 3 | ||||
| -rwxr-xr-x | tests.sh | 14 |
4 files changed, 16 insertions, 9 deletions
diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index ca56a7c0..c5ee1ec0 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -148,7 +148,11 @@ RUN php composer-setup.php RUN mv composer.phar /usr/bin/composer RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ - cd protobuf/php && \ + rm -rf protobuf && \ + git clone https://github.com/google/protobuf.git && \ + cd protobuf && \ + git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ + cd php && \ ln -sfn /usr/bin/php5.5 /usr/bin/php && \ ln -sfn /usr/bin/php-config5.5 /usr/bin/php-config && \ ln -sfn /usr/bin/phpize5.5 /usr/bin/phpize && \ diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index bf59503f..94d9a4c3 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -64,7 +64,7 @@ RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf/php && \ - git reset 734930f9197b7bc97c3c794c7a949fee2a08c280 && \ + git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ ln -sfn /usr/bin/php5.5 /usr/bin/php && \ ln -sfn /usr/bin/php-config5.5 /usr/bin/php-config && \ ln -sfn /usr/bin/phpize5.5 /usr/bin/phpize && \ diff --git a/src/google/protobuf/compiler/php/php_generator.cc b/src/google/protobuf/compiler/php/php_generator.cc index 6634680d..be2739ff 100644 --- a/src/google/protobuf/compiler/php/php_generator.cc +++ b/src/google/protobuf/compiler/php/php_generator.cc @@ -214,9 +214,6 @@ std::string GeneratedMetadataFileName(const std::string& proto_file, result += UnderscoresToCamelCase( file_no_suffix.substr(start_index, first_index - start_index), true); result += "/"; - GOOGLE_LOG(INFO) << start_index << " " << first_index; - GOOGLE_LOG(INFO) << file_no_suffix.substr(start_index, - first_index - start_index); start_index = first_index + 1; first_index = file_no_suffix.find_first_of("/", start_index); } @@ -327,6 +327,8 @@ build_jruby() { build_ruby_all() { build_ruby21 build_ruby22 + # TODO(teboring): Disable jruby test temperarily for it randomly fails. + # https://grpc-testing.appspot.com/job/protobuf_pull_request/735/consoleFull. build_jruby } @@ -386,10 +388,11 @@ use_php_bc() { build_php5.5() { use_php 5.5 - cd php + pushd php rm -rf vendor cp -r /usr/local/vendor-5.5 vendor ./vendor/bin/phpunit + popd } build_php5.5_c() { @@ -405,10 +408,11 @@ build_php5.5_zts_c() { build_php5.5_32() { use_php_bc 5.5 - cd php + pushd php rm -rf vendor cp -r /usr/local/vendor-5.5 vendor ./vendor/bin/phpunit + popd } build_php5.5_c_32() { @@ -419,10 +423,11 @@ build_php5.5_c_32() { build_php5.6() { use_php 5.6 - cd php + pushd php rm -rf vendor cp -r /usr/local/vendor-5.6 vendor ./vendor/bin/phpunit + popd } build_php5.6_c() { @@ -453,10 +458,11 @@ build_php5.6_mac() { build_php7.0() { use_php 7.0 - cd php + pushd php rm -rf vendor cp -r /usr/local/vendor-7.0 vendor ./vendor/bin/phpunit + popd } build_php7.0_c() { |