workaround the need to source activate.sh

pull/18844/head
Jan Tattermusch 6 years ago
parent 995b014904
commit d5c3108e46
  1. 13
      templates/tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh.template
  2. 11
      tools/dockerfile/interoptest/grpc_interop_aspnetcore/build_interop.sh

@ -28,8 +28,17 @@
# If needed, update dotnet SDK and put it on path
./build/get-dotnet.sh
source ./activate.sh
# 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 $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet
fi
./build/get-grpc.sh
cd testassets/InteropTestsWebsite

@ -26,7 +26,16 @@ cd /var/local/git/grpc-dotnet
# If needed, update dotnet SDK and put it on path
./build/get-dotnet.sh
source ./activate.sh
# 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 $(pwd)/.dotnet/dotnet /usr/local/bin/dotnet
fi
./build/get-grpc.sh

Loading…
Cancel
Save