diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-05-08 08:26:59 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-08 08:26:59 +0200 |
| commit | 77a6c99deeacf1dbc43f86298ae3f42fb4aec548 (patch) | |
| tree | c61992a0c11e1d3b1af73eaede1e8096e4c2712e /tools | |
| parent | 19145e71dca46cfce1b9ff89bc0ade686886b3b0 (diff) | |
| parent | cd1172c9dd3b346d261835bb7c6fdd94556a53b2 (diff) | |
Merge pull request #15294 from murgatroid99/node_interop_build_revert
Revert recent changes to node interop build script
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh index 21fdd0b490..c16efc1d35 100755 --- a/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh @@ -17,23 +17,12 @@ set -e mkdir -p /var/local/git - git clone /var/local/jenkins/grpc-node /var/local/git/grpc-node # clone gRPC submodules, use data from locally cloned submodules where possible (cd /var/local/jenkins/grpc-node/ && git submodule foreach 'cd /var/local/git/grpc-node \ && git submodule update --init --recursive --reference /var/local/jenkins/grpc-node/${name} \ ${name}') -# Use the pending c-core changes if possible -if [ -d "/var/local/jenkins/grpc" ]; then - cd /var/local/jenkins/grpc - CURRENT_COMMIT="$(git rev-parse --verify HEAD)" - cd /var/local/git/grpc-node/packages/grpc-native-core/deps/grpc/ - git fetch --tags --progress https://github.com/grpc/grpc.git +refs/pull/*:refs/remotes/origin/pr/* - git checkout $CURRENT_COMMIT - git submodule update --init --recursive --reference /var/local/jenkins/grpc -fi - # copy service account keys if available cp -r /var/local/jenkins/service_account $HOME || true |