diff options
Diffstat (limited to 'jenkins')
| -rwxr-xr-x | jenkins/buildcmds/pull_request_32.sh | 2 | ||||
| -rw-r--r-- | jenkins/docker/Dockerfile | 1 | ||||
| -rw-r--r-- | jenkins/docker32/Dockerfile | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/jenkins/buildcmds/pull_request_32.sh b/jenkins/buildcmds/pull_request_32.sh index 99df2971..bf0fb7ff 100755 --- a/jenkins/buildcmds/pull_request_32.sh +++ b/jenkins/buildcmds/pull_request_32.sh @@ -12,5 +12,5 @@ export DOCKERFILE_DIR=jenkins/docker32 export DOCKER_RUN_SCRIPT=jenkins/pull_request_in_docker.sh export OUTPUT_DIR=testoutput -export TEST_SET="php_all" +export TEST_SET="php_all_32" ./jenkins/build_and_run_docker.sh diff --git a/jenkins/docker/Dockerfile b/jenkins/docker/Dockerfile index 53ac38f3..03316369 100644 --- a/jenkins/docker/Dockerfile +++ b/jenkins/docker/Dockerfile @@ -113,6 +113,7 @@ ENV MVN mvn --batch-mode RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ + git reset bf379715c93b581eeb078cec1f0dd8a7d79df431 && \ ./autogen.sh && \ ./configure && \ make -j6 && \ diff --git a/jenkins/docker32/Dockerfile b/jenkins/docker32/Dockerfile index 73dfd8d5..a36338b4 100644 --- a/jenkins/docker32/Dockerfile +++ b/jenkins/docker32/Dockerfile @@ -64,6 +64,7 @@ RUN php -r "unlink('composer-setup.php');" RUN cd /tmp && \ git clone https://github.com/google/protobuf.git && \ cd protobuf && \ + git reset 734930f9197b7bc97c3c794c7a949fee2a08c280 && \ 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 && \ @@ -83,7 +84,9 @@ RUN wget http://am1.php.net/get/php-5.5.38.tar.bz2/from/this/mirror RUN mv mirror php-5.5.38.tar.bz2 RUN tar -xvf php-5.5.38.tar.bz2 RUN cd php-5.5.38 && ./configure --enable-maintainer-zts --prefix=/usr/local/php-5.5-zts && \ - make && make install + make && make install && make clean && cd .. +RUN cd php-5.5.38 && ./configure --enable-bcmath --prefix=/usr/local/php-5.5-bc && \ + make && make install && make clean && cd .. ################## # Python dependencies |