From 7f08fc203a8ab12513e4d029f49194c180a18016 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Tue, 1 Dec 2020 11:09:30 +0100 Subject: [PATCH] generate go build_interop.sh from the template --- templates/tools/dockerfile/go_build_interop.sh.include | 6 +++--- .../interoptest/grpc_interop_go1.11/build_interop.sh | 6 +++--- .../interoptest/grpc_interop_go1.7/build_interop.sh | 6 +++--- .../interoptest/grpc_interop_go1.8/build_interop.sh | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/tools/dockerfile/go_build_interop.sh.include b/templates/tools/dockerfile/go_build_interop.sh.include index bf5ff9228e2..a6bfeeba8c4 100755 --- a/templates/tools/dockerfile/go_build_interop.sh.include +++ b/templates/tools/dockerfile/go_build_interop.sh.include @@ -16,14 +16,14 @@ # Builds Go interop server and client in a base image. set -e +# Turn on support for Go modules. +export GO111MODULE=on + # Clone just the grpc-go source code without any dependencies. # We are cloning from a local git repo that contains the right revision # to test instead of using "go get" to download from Github directly. git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc -# Get all gRPC Go dependencies -(cd src/google.golang.org/grpc && make deps && make testdeps) - # copy service account keys if available cp -r /var/local/jenkins/service_account $HOME || true diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.11/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_go1.11/build_interop.sh index b11ace3a4e7..309340cb9ed 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.11/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_go1.11/build_interop.sh @@ -16,14 +16,14 @@ # Builds Go interop server and client in a base image. set -e +# Turn on support for Go modules. +export GO111MODULE=on + # Clone just the grpc-go source code without any dependencies. # We are cloning from a local git repo that contains the right revision # to test instead of using "go get" to download from Github directly. git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc -# Get all gRPC Go dependencies -(cd src/google.golang.org/grpc && make deps && make testdeps) - # copy service account keys if available cp -r /var/local/jenkins/service_account $HOME || true diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh index b11ace3a4e7..309340cb9ed 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_go1.7/build_interop.sh @@ -16,14 +16,14 @@ # Builds Go interop server and client in a base image. set -e +# Turn on support for Go modules. +export GO111MODULE=on + # Clone just the grpc-go source code without any dependencies. # We are cloning from a local git repo that contains the right revision # to test instead of using "go get" to download from Github directly. git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc -# Get all gRPC Go dependencies -(cd src/google.golang.org/grpc && make deps && make testdeps) - # copy service account keys if available cp -r /var/local/jenkins/service_account $HOME || true diff --git a/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh index b11ace3a4e7..309340cb9ed 100644 --- a/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_go1.8/build_interop.sh @@ -16,14 +16,14 @@ # Builds Go interop server and client in a base image. set -e +# Turn on support for Go modules. +export GO111MODULE=on + # Clone just the grpc-go source code without any dependencies. # We are cloning from a local git repo that contains the right revision # to test instead of using "go get" to download from Github directly. git clone --recursive /var/local/jenkins/grpc-go src/google.golang.org/grpc -# Get all gRPC Go dependencies -(cd src/google.golang.org/grpc && make deps && make testdeps) - # copy service account keys if available cp -r /var/local/jenkins/service_account $HOME || true