From 9abb7ef43422f716140c59b24be21da1b64788cf Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 31 May 2021 13:17:32 +0000 Subject: [PATCH] move goma env to build --- setup-goma-client.sh | 14 +------------- start-build.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/setup-goma-client.sh b/setup-goma-client.sh index 31f1c9f..f003e40 100644 --- a/setup-goma-client.sh +++ b/setup-goma-client.sh @@ -5,17 +5,5 @@ PATH=$GITHUB_WORKSPACE/chromium/src/third_party/llvm-build/Release+Asserts/bin:$ cipd install infra/goma/client/linux-amd64 -root $GITHUB_WORKSPACE/goma -cat "nomatter" >$GITHUB_WORKSPACE/.debug_auth_file +echo "nomatter" >$GITHUB_WORKSPACE/.debug_auth_file sudo cp $GITHUB_WORKSPACE/bromite-buildtools/goma_auth.py $GITHUB_WORKSPACE/goma/ - -export GOMA_SERVER_HOST=127.0.0.1 -export GOMA_SERVER_PORT=5050 -export GOMA_USE_SSL=false -export GOMA_HTTP_AUTHORIZATION_FILE=$GITHUB_WORKSPACE/.debug_auth_file -export GOMA_HERMETIC=error -export GOMA_USE_LOCAL=false -export GOMA_FALLBACK=true -export GOMA_ARBITRARY_TOOLCHAIN_SUPPORT=true - -$GITHUB_WORKSPACE/goma/goma_ctl.py ensure_stop -$GITHUB_WORKSPACE/goma/goma_ctl.py ensure_start diff --git a/start-build.sh b/start-build.sh index cdd0b41..d9f63d2 100644 --- a/start-build.sh +++ b/start-build.sh @@ -16,6 +16,18 @@ bash ./bromite-buildtools/start-goma-server.sh bash ./bromite-buildtools/setup-goma-client.sh bash ./bromite-buildtools/start_proxy.sh +export GOMA_SERVER_HOST=127.0.0.1 +export GOMA_SERVER_PORT=5050 +export GOMA_USE_SSL=false +export GOMA_HTTP_AUTHORIZATION_FILE=$GITHUB_WORKSPACE/.debug_auth_file +export GOMA_HERMETIC=error +export GOMA_USE_LOCAL=false +export GOMA_FALLBACK=true +export GOMA_ARBITRARY_TOOLCHAIN_SUPPORT=true + +$GITHUB_WORKSPACE/goma/goma_ctl.py ensure_stop +$GITHUB_WORKSPACE/goma/goma_ctl.py ensure_start + cd chromium/src echo -e ${RED} -------- gn gen ${NC}