Skip to content

P
protobuf
Commit 32ad5a3e authored by Feng Xiao's avatar Feng Xiao
Browse files
Options

Use "git reset --hard" to actually reset the code.

parent b7c813fb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
jenkins/docker/Dockerfile
View file @ 32ad5a3e
...@@ -129,7 +129,7 @@ ENV MVN mvn --batch-mode ...@@ -129,7 +129,7 @@ ENV MVN mvn --batch-mode
RUN cd /tmp && \ RUN cd /tmp && \
git clone https://github.com/google/protobuf.git && \ git clone https://github.com/google/protobuf.git && \
cd protobuf && \ cd protobuf && \
git reset c2b3b3e04e7a023efe06f2107705b45428847800 && \ git reset --hard c2b3b3e04e7a023efe06f2107705b45428847800 && \
./autogen.sh && \ ./autogen.sh && \
./configure && \ ./configure && \
make -j4 && \ make -j4 && \
...@@ -157,7 +157,7 @@ RUN cd /tmp && \ ...@@ -157,7 +157,7 @@ RUN cd /tmp && \
rm -rf protobuf && \ rm -rf protobuf && \
git clone https://github.com/google/protobuf.git && \ git clone https://github.com/google/protobuf.git && \
cd protobuf && \ cd protobuf && \
git reset 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \ git reset --hard 46ae90dc5e145b12fffa7e053a908a9f3e066286 && \
cd php && \ cd php && \
ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \ ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \
ln -sfn /usr/local/php-5.5/bin/php-config /usr/bin/php-config && \ ln -sfn /usr/local/php-5.5/bin/php-config /usr/bin/php-config && \
......
jenkins/docker32/Dockerfile
View file @ 32ad5a3e
...@@ -64,7 +64,7 @@ RUN php -r "unlink('composer-setup.php');" ...@@ -64,7 +64,7 @@ RUN php -r "unlink('composer-setup.php');"
RUN cd /tmp && \ RUN cd /tmp && \
git clone https://github.com/google/protobuf.git && \ git clone https://github.com/google/protobuf.git && \
cd protobuf/php && \ cd protobuf/php && \
git reset 6b27c1f981a9a93918e4039f236ead27165a8e91 && \ git reset --hard 6b27c1f981a9a93918e4039f236ead27165a8e91 && \
ln -sfn /usr/bin/php5.5 /usr/bin/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/php-config5.5 /usr/bin/php-config && \
ln -sfn /usr/bin/phpize5.5 /usr/bin/phpize && \ ln -sfn /usr/bin/phpize5.5 /usr/bin/phpize && \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment