grpc
/
grpc-experiments
mirror of https://github.com/grpc/grpc-experiments.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gdebug: fix codegen script 

Fix bug where we fail to check out correct SHA if dir already exists.

Remove `exec` because it makes the `cp` fail to run.
This commit is contained in:
Spencer Fang 2018-10-03 08:18:52 -07:00 committed by zpencer
parent 3ce48e1a37
commit 5259aa5493
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdebug/buildscripts/channelz_codgen.sh
View File

@ -17,9 +17,9 @@ if [[ ! -d "$GITHUB_DIR"/grpc-web ]]; then
mkdir -p "$GITHUB_DIR" mkdir -p "$GITHUB_DIR"
cd "$GITHUB_DIR" cd "$GITHUB_DIR"
git clone https://github.com/grpc/grpc-web.git git clone https://github.com/grpc/grpc-web.git
cd grpc-web/
git checkout "$GRPC_WEB_SHA"
fi fi
cd "$GITHUB_DIR"/grpc-web/
git checkout "$GRPC_WEB_SHA"
cd "$GITHUB_DIR"/grpc-web//net/grpc/gateway/docker cd "$GITHUB_DIR"/grpc-web//net/grpc/gateway/docker
docker build -t channelz_grpc_web_prereqs ./prereqs/ docker build -t channelz_grpc_web_prereqs ./prereqs/
@ -27,6 +27,6 @@ docker build -t channelz_grpc_web_prereqs ./prereqs/
cd "$GRPC_ZPAGES_DIR"/docker cd "$GRPC_ZPAGES_DIR"/docker
docker build -t channelz_codegen codegen docker build -t channelz_codegen codegen
exec docker run --rm -v "$GRPC_ZPAGES_DIR"/docker/codegen/shared_dir:/shared_dir/ channelz_codegen bash -c "function fixFiles() { chown -R $(id -u):$(id -g) /shared_dir; }; trap fixFiles EXIT; /shared_dir/scripts/gen_channelz_pb.sh $GRPC_PROTO_SHA" docker run --rm -v "$GRPC_ZPAGES_DIR"/docker/codegen/shared_dir:/shared_dir/ channelz_codegen bash -c "function fixFiles() { chown -R $(id -u):$(id -g) /shared_dir; }; trap fixFiles EXIT; /shared_dir/scripts/gen_channelz_pb.sh $GRPC_PROTO_SHA"
mv "$GRPC_ZPAGES_DIR"/docker/codegen/shared_dir/gen_out/channelz.js "$GRPC_ZPAGES_DIR"/web/channelzui/src/generated/channelz.js mv "$GRPC_ZPAGES_DIR"/docker/codegen/shared_dir/gen_out/channelz.js "$GRPC_ZPAGES_DIR"/web/channelzui/src/generated/channelz.js