From 409f95467351d7403578d529753a09bb0679b5b0 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Thu, 23 Aug 2018 12:43:35 -0700 Subject: Revert changed links in Dockerfiles. These changes require building new docker images and without new images our kokoro tests are all failing. --- kokoro/linux/32-bit/Dockerfile | 2 +- kokoro/linux/64-bit/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 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 && \ -- cgit v1.2.3 From a0a17e24d76dbf0cc367d81df2bee179cbc73f90 Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Thu, 23 Aug 2018 15:35:52 -0700 Subject: Fix go tests. --- tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.sh b/tests.sh index 1e24177e..49534137 100755 --- a/tests.sh +++ b/tests.sh @@ -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" -- cgit v1.2.3