diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-23 16:17:25 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-23 16:17:25 -0700 |
commit | 45d03a977193d1dcce5251e4bffe17bf0ba738ec (patch) | |
tree | 5e7979bb8f5939aa1f68f328fafaf2d2beb6d836 | |
parent | fd4baa91e7c127a29ee6d5f6ecf0fa149f6d9cec (diff) | |
parent | a0a17e24d76dbf0cc367d81df2bee179cbc73f90 (diff) | |
download | protobuf-45d03a977193d1dcce5251e4bffe17bf0ba738ec.tar.gz protobuf-45d03a977193d1dcce5251e4bffe17bf0ba738ec.tar.bz2 protobuf-45d03a977193d1dcce5251e4bffe17bf0ba738ec.zip |
Merge pull request #5074 from xfxyjwf/links
Revert changed links in Dockerfiles.
-rw-r--r-- | kokoro/linux/32-bit/Dockerfile | 2 | ||||
-rw-r--r-- | kokoro/linux/64-bit/Dockerfile | 4 | ||||
-rwxr-xr-x | tests.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kokoro/linux/32-bit/Dockerfile b/kokoro/linux/32-bit/Dockerfile index c914b964..1278889f 100644 --- a/kokoro/linux/32-bit/Dockerfile +++ b/kokoro/linux/32-bit/Dockerfile @@ -96,7 +96,7 @@ RUN php -r "unlink('composer-setup.php');" RUN composer config -g -- disable-tls true RUN composer config -g -- secure-http false RUN cd /tmp && \ - git clone https://github.com/protocolbuffers/protobuf.git && \ + git clone https://github.com/google/protobuf.git && \ cd protobuf/php && \ git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \ ln -sfn /usr/local/php-5.5/bin/php /usr/bin/php && \ diff --git a/kokoro/linux/64-bit/Dockerfile b/kokoro/linux/64-bit/Dockerfile index 88dc3d7d..3a279e66 100644 --- a/kokoro/linux/64-bit/Dockerfile +++ b/kokoro/linux/64-bit/Dockerfile @@ -127,7 +127,7 @@ ENV MAVEN_REPO /var/maven_local_repository ENV MVN mvn --batch-mode RUN cd /tmp && \ - git clone https://github.com/protocolbuffers/protobuf.git && \ + git clone https://github.com/google/protobuf.git && \ cd protobuf && \ git reset --hard 129a6e2aca95dcfb6c3e717d7b9cca1f104fde39 && \ ./autogen.sh && \ @@ -180,7 +180,7 @@ RUN composer config -g -- disable-tls true RUN composer config -g -- secure-http false RUN cd /tmp && \ rm -rf protobuf && \ - git clone https://github.com/protocolbuffers/protobuf.git && \ + git clone https://github.com/google/protobuf.git && \ cd protobuf && \ git reset --hard 49b44bff2b6257a119f9c6a342d6151c736586b8 && \ cd php && \ @@ -105,7 +105,7 @@ build_golang() { export PATH="`pwd`/src:$PATH" export GOPATH="$HOME/gocode" - mkdir -p "$GOPATH/src/github.com/google" + mkdir -p "$GOPATH/src/github.com/protocolbuffers" rm -f "$GOPATH/src/github.com/protocolbuffers/protobuf" ln -s "`pwd`" "$GOPATH/src/github.com/protocolbuffers/protobuf" export PATH="$GOPATH/bin:$PATH" |