Merge pull request #18714 from JunTaoLuo/johluo/update-interop

Update aspnetcore interop scripts to fix the interop build
pull/18650/head^2
Jan Tattermusch 6 years ago committed by GitHub
commit 452a07e6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template
  2. 10
      tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh

@ -28,9 +28,15 @@
# If needed, update dotnet SDK and put it on path
./build/get-dotnet.sh
if [ -f $HOME/.dotnet/dotnet ]
# Normally we would source ./activate.sh
# to add dotnet to PATH, but that would only
# work for the build and not for a subsequent
# dotnet run from a different shell,
# so we create a symlink instead.
# TODO(jtattermusch): Come up with a cleaner solution.
if [ -f $(pwd)/.dotnet/dotnet ]
then
ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet
ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet
fi
./build/get-grpc.sh

@ -26,9 +26,15 @@ cd /var/local/git/grpc-dotnet
# If needed, update dotnet SDK and put it on path
./build/get-dotnet.sh
if [ -f $HOME/.dotnet/dotnet ]
# Normally we would source ./activate.sh
# to add dotnet to PATH, but that would only
# work for the build and not for a subsequent
# dotnet run from a different shell,
# so we create a symlink instead.
# TODO(jtattermusch): Come up with a cleaner solution.
if [ -f $(pwd)/.dotnet/dotnet ]
then
ln -s $HOME/.dotnet/dotnet /usr/local/bin/dotnet
ln -s $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet
fi
./build/get-grpc.sh

Loading…
Cancel
Save